From: Dan Prince <dprince@redhat.com>
Date: Thu, 2 Mar 2017 17:41:30 +0000 (-0500)
Subject: Overwrite nova placement with stub for docker
X-Git-Tag: opnfv-6.0.0~957^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c68704b4b0df2a79e3ebdc9da0e8d7c673487887;p=apex-tripleo-heat-templates.git

Overwrite nova placement with stub for docker

This updates kolla config to overwrite the stock
version with the puppet-nova generated mock.

Depends-On: Ie16a60c604ecf9f4012b0630f91e6ece2b6855db

Change-Id: I320f024adc88102ea24c0212702fe2dce826874f
Closes-bug: #440612
---

diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index f0f7d724..b03f6a41 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -70,6 +70,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'