X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fetcd.yaml;h=42c9f2d331499c4dc33d8508533debb43f2c13bc;hb=643c4148ee10c51a49b95103f680d574fd5b139b;hp=e5a7096bd204cd8f8cd31577a42b5102cff3f0f1;hpb=acb0b5289db1415bc8336fac74d7a89c1ee4ee7d;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml
index e5a7096b..42c9f2d3 100644
--- a/docker/services/etcd.yaml
+++ b/docker/services/etcd.yaml
@@ -4,19 +4,21 @@ description: >
   OpenStack containerized etcd services
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerEtcdImage:
     description: image
-    default: 'centos-binary-etcd:latest'
+    type: string
+  DockerEtcdConfigImage:
+    description: The container image to use for the etcd config_volume
     type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -45,6 +47,7 @@ resources:
     type: ../../puppet/services/etcd.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EtcdInitialClusterToken: {get_param: EtcdInitialClusterToken}
@@ -67,13 +70,15 @@ outputs:
       puppet_config:
         config_volume: etcd
         step_config: *step_config
-        config_image: &etcd_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerEtcdImage} ]
+        config_image: &etcd_config_image {get_param: DockerEtcdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/etcd.json:
           command: /usr/bin/etcd --config-file /etc/etcd/etcd.yml
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/lib/etcd
               owner: etcd:etcd
@@ -81,7 +86,7 @@ outputs:
       docker_config:
         step_2:
           etcd:
-            image: *etcd_image
+            image: {get_param: DockerEtcdImage}
             net: host
             privileged: false
             restart: always
@@ -89,7 +94,7 @@ outputs:
               - /var/lib/etcd:/var/lib/etcd
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/kolla/config_files/etcd.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/etcd/etc/etcd/etcd.yml:/etc/etcd/etcd.yml:ro
+              - /var/lib/config-data/puppet-generated/etcd/:/var/lib/kolla/config_files/src:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       docker_puppet_tasks:
@@ -98,9 +103,9 @@ outputs:
           config_volume: 'etcd_init_tasks'
           puppet_tags: 'etcd_key'
           step_config: 'include ::tripleo::profile::base::etcd'
-          config_image: *etcd_image
+          config_image: *etcd_config_image
           volumes:
-            - /var/lib/config-data/etcd/etc/:/etc
+            - /var/lib/config-data/etcd/etc/etcd/:/etc/etcd:ro
             - /var/lib/etcd:/var/lib/etcd:ro
       host_prep_tasks:
         - name: create /var/lib/etcd