aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-03-02 12:41:30 -0500
committerDan Prince <dprince@redhat.com>2017-03-02 20:36:27 +0000
commitc68704b4b0df2a79e3ebdc9da0e8d7c673487887 (patch)
treeecbae3dccaf221e81dbb4b76252c00972c322366 /docker/services
parentb6c74c47aab63be17e2e6aeb39674ead879bba6a (diff)
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
Diffstat (limited to 'docker/services')
-rw-r--r--docker/services/nova-placement.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index f0f7d72..b03f6a4 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'