aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/aodh-api.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-10 17:20:09 +0000
committerGerrit Code Review <review@openstack.org>2017-07-10 17:20:09 +0000
commit322f2dbd4c1d9c8617186bcb9211d7a1fe10ba3f (patch)
treec0714854a4d02dfb8d74a2d48f5959ee89adf028 /docker/services/aodh-api.yaml
parent83defdbdbf12a4ba9d843cd115d1acb931d1d151 (diff)
parentcf18e865d14adc319b6c2dfafd650f32dad4d853 (diff)
Merge "Copy only generated puppet files into the container"
Diffstat (limited to 'docker/services/aodh-api.yaml')
-rw-r--r--docker/services/aodh-api.yaml11
1 files changed, 6 insertions, 5 deletions
diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index 3be0f182..fc1c3168 100644
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -84,6 +84,11 @@ outputs:
kolla_config:
/var/lib/kolla/config_files/aodh_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/aodh
owner: aodh:aodh
@@ -125,11 +130,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/aodh_api.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
- - /var/lib/config-data/aodh/etc/httpd/conf/:/etc/httpd/conf/:ro
- - /var/lib/config-data/aodh/etc/httpd/conf.d/:/etc/httpd/conf.d/:ro
- - /var/lib/config-data/aodh/etc/httpd/conf.modules.d/:/etc/httpd/conf.modules.d/:ro
- - /var/lib/config-data/aodh/var/www/:/var/www/:ro
+ - /var/lib/config-data/puppet-generated/aodh/:/var/lib/kolla/config_files/src:ro
- /var/log/containers/aodh:/var/log/aodh
-
if: