Merge "Use a single configuration file for specifying docker containers."

diff --cc docker/services/aodh-api.yaml
Simple merge

diff --cc docker/services/aodh-evaluator.yaml
Simple merge

diff --cc docker/services/aodh-listener.yaml
Simple merge

diff --cc docker/services/aodh-notifier.yaml
Simple merge

diff --cc docker/services/ceilometer-agent-central.yaml
Simple merge

diff --cc docker/services/ceilometer-agent-compute.yaml
Simple merge

diff --cc docker/services/ceilometer-agent-ipmi.yaml
Simple merge

diff --cc docker/services/ceilometer-agent-notification.yaml
Simple merge

diff --cc docker/services/cinder-api.yaml
Simple merge

diff --cc docker/services/cinder-backup.yaml
Simple merge

diff --cc docker/services/cinder-scheduler.yaml
Simple merge

diff --cc docker/services/cinder-volume.yaml
Simple merge

diff --cc docker/services/collectd.yaml
Simple merge

diff --cc docker/services/congress.yaml
Simple merge

diff --cc docker/services/database/mongodb.yaml
Simple merge

diff --cc docker/services/database/mysql-client.yaml
index 9e51aea,13b8f22..d45d58e
--- 1/docker/services/database/mysql-client.yaml
--- 2/docker/services/database/mysql-client.yaml
+++ b/docker/services/database/mysql-client.yaml
@@@ -4,18 -4,9 +4,13 @@@ description: 
    Configuration for containerized MySQL clients
  
  parameters:
-   DockerNamespace:
-     description: namespace
-     default: 'tripleoupstream'
-     type: string
    DockerMysqlClientConfigImage:
      description: The container image to use for the mysql_client config_volume
-     default: 'centos-binary-mariadb:latest'
      type: string
 +  ServiceData:
 +    default: {}
 +    description: Dictionary packing service data
 +    type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set

diff --cc docker/services/database/mysql.yaml
Simple merge

diff --cc docker/services/database/redis.yaml
Simple merge

diff --cc docker/services/ec2-api.yaml
Simple merge

diff --cc docker/services/etcd.yaml
Simple merge

diff --cc docker/services/glance-api.yaml
Simple merge

diff --cc docker/services/gnocchi-api.yaml
Simple merge

diff --cc docker/services/gnocchi-metricd.yaml
Simple merge

diff --cc docker/services/gnocchi-statsd.yaml
Simple merge

diff --cc docker/services/haproxy.yaml
index 5fc9b2b,bc91ec2..21baf5c
--- 1/docker/services/haproxy.yaml
--- 2/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@@@ -13,13 -9,7 +9,11 @@@ parameters
      type: string
    DockerHAProxyConfigImage:
      description: The container image to use for the haproxy config_volume
-     default: 'centos-binary-haproxy:latest'
      type: string
 +  ServiceData:
 +    default: {}
 +    description: Dictionary packing service data
 +    type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set

diff --cc docker/services/heat-api-cfn.yaml
Simple merge

diff --cc docker/services/heat-api.yaml
Simple merge

diff --cc docker/services/heat-engine.yaml
Simple merge

diff --cc docker/services/horizon.yaml
Simple merge

diff --cc docker/services/ironic-api.yaml
Simple merge

diff --cc docker/services/ironic-conductor.yaml
Simple merge

diff --cc docker/services/ironic-pxe.yaml
Simple merge

diff --cc docker/services/iscsid.yaml
Simple merge

diff --cc docker/services/keystone.yaml
Simple merge

diff --cc docker/services/manila-api.yaml
Simple merge

diff --cc docker/services/manila-scheduler.yaml
Simple merge

diff --cc docker/services/memcached.yaml
Simple merge

diff --cc docker/services/mistral-api.yaml
Simple merge

diff --cc docker/services/mistral-engine.yaml
Simple merge

diff --cc docker/services/mistral-executor.yaml
Simple merge

diff --cc docker/services/multipathd.yaml
Simple merge

diff --cc docker/services/neutron-api.yaml
Simple merge

diff --cc docker/services/neutron-dhcp.yaml
Simple merge

diff --cc docker/services/neutron-l3.yaml
index 13428ee,ce1490c..c3a4d27
--- 1/docker/services/neutron-l3.yaml
--- 2/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@@ -13,13 -9,7 +9,11 @@@ parameters
      type: string
    DockerNeutronConfigImage:
      description: The container image to use for the neutron config_volume
-     default: 'centos-binary-neutron-server:latest'
      type: string
 +  ServiceData:
 +    default: {}
 +    description: Dictionary packing service data
 +    type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set

diff --cc docker/services/neutron-metadata.yaml
index dee4fd2,28f6d64..f030fae
--- 1/docker/services/neutron-metadata.yaml
--- 2/docker/services/neutron-metadata.yaml
+++ b/docker/services/neutron-metadata.yaml
@@@ -13,13 -9,7 +9,11 @@@ parameters
      type: string
    DockerNeutronConfigImage:
      description: The container image to use for the neutron config_volume
-     default: 'centos-binary-neutron-server:latest'
      type: string
 +  ServiceData:
 +    default: {}
 +    description: Dictionary packing service data
 +    type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set

diff --cc docker/services/neutron-ovs-agent.yaml
index dd2bc74,abb2f9e..4cce23d
--- 1/docker/services/neutron-ovs-agent.yaml
--- 2/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@@ -13,13 -9,7 +9,11 @@@ parameters
      type: string
    DockerNeutronConfigImage:
      description: The container image to use for the neutron config_volume
-     default: 'centos-binary-neutron-server:latest'
      type: string
 +  ServiceData:
 +    default: {}
 +    description: Dictionary packing service data
 +    type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set

diff --cc docker/services/neutron-plugin-ml2.yaml
Simple merge

diff --cc docker/services/nova-api.yaml
Simple merge

diff --cc docker/services/nova-compute.yaml
index 4816d36,b1c5488..d8e7692
--- 1/docker/services/nova-compute.yaml
--- 2/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@@ -13,13 -9,7 +9,11 @@@ parameters
      type: string
    DockerNovaLibvirtConfigImage:
      description: The container image to use for the nova_libvirt config_volume
-     default: 'centos-binary-nova-compute:latest'
      type: string
 +  ServiceData:
 +    default: {}
 +    description: Dictionary packing service data
 +    type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set

diff --cc docker/services/nova-conductor.yaml
Simple merge

diff --cc docker/services/nova-consoleauth.yaml
Simple merge

diff --cc docker/services/nova-ironic.yaml
index 6983046,e22fcec..89ef95e
--- 1/docker/services/nova-ironic.yaml
--- 2/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@@ -13,13 -9,7 +9,11 @@@ parameters
      type: string
    DockerNovaConfigImage:
      description: The container image to use for the nova config_volume
-     default: 'centos-binary-nova-base:latest'
      type: string
 +  ServiceData:
 +    default: {}
 +    description: Dictionary packing service data
 +    type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set

diff --cc docker/services/nova-libvirt.yaml
Simple merge

diff --cc docker/services/nova-placement.yaml
Simple merge

diff --cc docker/services/nova-scheduler.yaml
Simple merge

diff --cc docker/services/nova-vnc-proxy.yaml
Simple merge

diff --cc docker/services/octavia-api.yaml
Simple merge

diff --cc docker/services/octavia-health-manager.yaml
Simple merge

diff --cc docker/services/octavia-housekeeping.yaml
Simple merge

diff --cc docker/services/octavia-worker.yaml
Simple merge

diff --cc docker/services/pacemaker/cinder-backup.yaml
Simple merge

diff --cc docker/services/pacemaker/cinder-volume.yaml
Simple merge

diff --cc docker/services/pacemaker/clustercheck.yaml
Simple merge

diff --cc docker/services/pacemaker/database/mysql.yaml
Simple merge

diff --cc docker/services/pacemaker/database/redis.yaml
Simple merge

diff --cc docker/services/pacemaker/haproxy.yaml
index 9b0bdfe,ab76971..86c460f
--- 1/docker/services/pacemaker/haproxy.yaml
--- 2/docker/services/pacemaker/haproxy.yaml
+++ b/docker/services/pacemaker/haproxy.yaml
@@@ -13,13 -9,7 +9,11 @@@ parameters
      type: string
    DockerHAProxyConfigImage:
      description: The container image to use for the haproxy config_volume
-     default: 'centos-binary-haproxy:latest'
      type: string
 +  ServiceData:
 +    default: {}
 +    description: Dictionary packing service data
 +    type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set

diff --cc docker/services/pacemaker/rabbitmq.yaml
Simple merge

diff --cc docker/services/panko-api.yaml
Simple merge

diff --cc docker/services/rabbitmq.yaml
Simple merge

diff --cc docker/services/sahara-api.yaml
Simple merge

diff --cc docker/services/sahara-engine.yaml
Simple merge

diff --cc docker/services/sensu-client.yaml
Simple merge

diff --cc docker/services/swift-proxy.yaml
Simple merge

diff --cc docker/services/swift-ringbuilder.yaml
index f51d6c7,cce32dd..e4e2c7d
--- 1/docker/services/swift-ringbuilder.yaml
--- 2/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@@@ -4,18 -4,9 +4,13 @@@ description: 
    OpenStack Swift Ringbuilder
  
  parameters:
-   DockerNamespace:
-     description: namespace
-     default: 'tripleoupstream'
-     type: string
    DockerSwiftConfigImage:
      description: The container image to use for the swift config_volume
-     default: 'centos-binary-swift-proxy-server:latest'
      type: string
 +  ServiceData:
 +    default: {}
 +    description: Dictionary packing service data
 +    type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set

diff --cc docker/services/swift-storage.yaml
Simple merge

diff --cc docker/services/tacker.yaml
Simple merge

diff --cc docker/services/zaqar.yaml
Simple merge