From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 15 Jul 2017 06:19:13 +0000 (+0000)
Subject: Merge "Use a single configuration file for specifying docker containers."
X-Git-Tag: opnfv-6.0.0~396
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2185b835602ffb276b8142db68d472611fdf127a;p=apex-tripleo-heat-templates.git

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

2185b835602ffb276b8142db68d472611fdf127a
diff --cc docker/services/database/mysql-client.yaml
index 9e51aeab,13b8f22a..d45d58e1
--- a/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/haproxy.yaml
index 5fc9b2bd,bc91ec23..21baf5c6
--- a/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/neutron-l3.yaml
index 13428eed,ce1490c7..c3a4d27f
--- a/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 dee4fd20,28f6d640..f030faef
--- a/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 dd2bc743,abb2f9e1..4cce23d9
--- a/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/nova-compute.yaml
index 4816d360,b1c5488f..d8e76925
--- a/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-ironic.yaml
index 69830466,e22fceca..89ef95ea
--- a/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/pacemaker/haproxy.yaml
index 9b0bdfe1,ab76971f..86c460fa
--- a/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/swift-ringbuilder.yaml
index f51d6c77,cce32ddb..e4e2c7d2
--- a/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