diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-07 00:29:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-07 00:29:31 +0000 |
| commit | d4e5dc1455071a44a7371d016a54a9832b0fb2d1 (patch) | |
| tree | 0e1861584bcc6e97fa27b9f81a61149c8efca39d /docker | |
| parent | 46aeff751500474a67854f9d407263c9b6dd4abf (diff) | |
| parent | c68704b4b0df2a79e3ebdc9da0e8d7c673487887 (diff) | |
Merge "Overwrite nova placement with stub for docker"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/nova-placement.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml index 54469795..6629843f 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' |