X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fnova-placement.yaml;h=8da48d37fbca7f2d4eae7cc304bf83c67722cc12;hb=a8d511a05e2f94af177155546bcc5b74ee0329a0;hp=5446979503845b724b1cb9e5840e3a3f995d88c6;hpb=540df69624e37ba6d9ab8ebe9e2e0ac54a7acb49;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 54469795..8da48d37 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -73,6 +73,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'
@@ -102,3 +108,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