X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fnova-placement.yaml;h=53460a83e2160ced561c46228a14154ab41310c5;hb=89927b6b4da16b5234778711e262e0febd3f6814;hp=f0f7d724f669473f46a2a4f837c8ff44956f33c4;hpb=1fcae324219a77d74fa12fb9eaac400a0658cac4;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index f0f7d724..53460a83 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NovaPlacementBase:
     type: ../../puppet/services/nova-placement.yaml
     properties:
@@ -45,43 +48,21 @@ outputs:
         map_merge:
           - get_attr: [NovaPlacementBase, role_data, config_settings]
           - apache::default_vhost: false
-      step_config: {get_attr: [NovaPlacementBase, role_data, step_config]}
+      step_config: &step_config
+        get_attr: [NovaPlacementBase, role_data, step_config]
       service_config_settings: {get_attr: [NovaPlacementBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
-      docker_image: &nova_placement_image
-        list_join:
+      puppet_config:
+        config_volume: nova_placement
+        puppet_tags: nova_config
+        step_config: *step_config
+        config_image: &nova_placement_image
+          list_join:
           - '/'
           - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
-      puppet_tags: nova_config
-      config_volume: nova_placement
-      config_image:
-        list_join:
-        - '/'
-        - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/nova_placement.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/nova/nova.conf
-             owner: nova
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/nova/nova.conf
-           - dest: /etc/httpd/conf.d/10-placement_wsgi.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-placement_wsgi.conf
-           - dest: /etc/httpd/conf/httpd.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/httpd.conf
-           - dest: /etc/httpd/conf/ports.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/ports.conf
-           - dest: /var/www/cgi-bin/nova/nova-placement-api
-             owner: nova
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/www/cgi-bin/nova/nova-placement-api
+        /var/lib/kolla/config_files/nova_placement.json:
+          command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         # start this early so it is up before computes start reporting
         step_3:
@@ -92,10 +73,18 @@ outputs:
             user: root
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova_placement/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/nova_placement/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable nova_placement service (running under httpd)
+          tags: step2
+          service: name=httpd state=stopped enabled=no