diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-10 17:20:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-10 17:20:09 +0000 |
| commit | 322f2dbd4c1d9c8617186bcb9211d7a1fe10ba3f (patch) | |
| tree | c0714854a4d02dfb8d74a2d48f5959ee89adf028 /docker/services/panko-api.yaml | |
| parent | 83defdbdbf12a4ba9d843cd115d1acb931d1d151 (diff) | |
| parent | cf18e865d14adc319b6c2dfafd650f32dad4d853 (diff) | |
Merge "Copy only generated puppet files into the container"
Diffstat (limited to 'docker/services/panko-api.yaml')
| -rw-r--r-- | docker/services/panko-api.yaml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml index 0f556063..fa1a7076 100644 --- a/docker/services/panko-api.yaml +++ b/docker/services/panko-api.yaml @@ -86,6 +86,11 @@ outputs: kolla_config: /var/lib/kolla/config_files/panko_api.json: command: /usr/sbin/httpd -DFOREGROUND + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true permissions: - path: /var/log/panko owner: panko:panko @@ -127,11 +132,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/panko_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/panko/etc/panko/:/etc/panko/:ro - - /var/lib/config-data/panko/etc/httpd/conf/:/etc/httpd/conf/:ro - - /var/lib/config-data/panko/etc/httpd/conf.d/:/etc/httpd/conf.d/:ro - - /var/lib/config-data/panko/etc/httpd/conf.modules.d/:/etc/httpd/conf.modules.d/:ro - - /var/lib/config-data/panko/var/www/:/var/www/:ro + - /var/lib/config-data/puppet-generated/panko/:/var/lib/kolla/config_files/src:ro - /var/log/containers/panko:/var/log/panko - if: |