aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/rabbitmq.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/rabbitmq.yaml
parent83defdbdbf12a4ba9d843cd115d1acb931d1d151 (diff)
parentcf18e865d14adc319b6c2dfafd650f32dad4d853 (diff)
Merge "Copy only generated puppet files into the container"
Diffstat (limited to 'docker/services/rabbitmq.yaml')
-rw-r--r--docker/services/rabbitmq.yaml9
1 files changed, 7 insertions, 2 deletions
diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index f42f2ed2..dd7c26a3 100644
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -84,6 +84,11 @@ outputs:
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json:
command: /usr/lib/rabbitmq/bin/rabbitmq-server
+ config_files:
+ - source: "/var/lib/kolla/config_files/src/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/lib/rabbitmq
owner: rabbitmq:rabbitmq
@@ -114,7 +119,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
+ - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq
- /var/log/containers/rabbitmq:/var/log/rabbitmq
environment:
@@ -142,7 +147,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
+ - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq
- /var/log/containers/rabbitmq:/var/log/rabbitmq
environment: