Merge "Overwrite nova placement with stub for docker"

2017-03-07 00:29:31 +00:00
parent 46aeff7515 c68704b4b0
commit d4e5dc1455
1 changed files with 6 additions and 0 deletions
--- 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'