X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fnova-placement.yaml;h=464dfe709a64bd159e87e113ce1f10b57cf4ba9e;hb=c4b52f3daa8474832790041cf885385a3addb2d6;hp=528a20ead07b2512df4a9bc86b1567c3ee875c4d;hpb=1916259308c645d659a4428e26c16a4c5a89c9e4;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 528a20ea..464dfe70 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-nova-placement-api:latest'
     type: string
+  DockerNovaPlacementConfigImage:
+    description: The container image to use for the nova_placement config_volume
+    default: 'centos-binary-nova-placement-api:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -33,6 +37,7 @@ parameters:
   RoleParameters:
     default: {}
     description: Parameters specific to the role
+    type: json
 
 resources:
 
@@ -65,13 +70,18 @@ outputs:
         config_volume: nova_placement
         puppet_tags: nova_config
         step_config: *step_config
-        config_image: &nova_placement_image
+        config_image:
           list_join:
           - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
+          - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/nova_placement.json:
           command: /usr/sbin/httpd -DFOREGROUND
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/nova
               owner: nova:nova
@@ -81,7 +91,10 @@ outputs:
         step_3:
           nova_placement:
             start_order: 1
-            image: *nova_placement_image
+            image:
+              list_join:
+              - '/'
+              - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
             net: host
             user: root
             restart: always
@@ -90,9 +103,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/nova_placement/etc/nova/:/etc/nova/:ro
-                  - /var/lib/config-data/nova_placement/etc/httpd/:/etc/httpd/:ro
-                  - /var/lib/config-data/nova_placement/var/www/:/var/www/:ro
+                  - /var/lib/config-data/puppet-generated/nova_placement/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/nova:/var/log/nova
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS