Merge "Keep existing data for containerized Swift"

[apex-tripleo-heat-templates.git] / docker / services / nova-placement.yaml

diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 5446979..0f32e33 100644 (file)
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -49,10 +49,6 @@ outputs:
         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:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
       puppet_config:
         config_volume: nova_placement
         puppet_tags: nova_config
@@ -73,6 +69,12 @@ outputs:
              owner: root
              perm: '0644'
              source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-placement_wsgi.conf
+           # puppet generates a stubbed out version of the stock one so we
+           # copy it in to overwrite the existing one
+           - dest: /etc/httpd/conf.d/00-nova-placement-api.conf
+             owner: root
+             perm: '0644'
+             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/00-nova-placement-api.conf
            - dest: /etc/httpd/conf/httpd.conf
              owner: root
              perm: '0644'
@@ -90,7 +92,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
@@ -102,3 +107,7 @@ outputs:
               - /etc/localtime:/etc/localtime: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