aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-24 09:30:23 +0000
committerGerrit Code Review <review@openstack.org>2017-04-24 09:30:23 +0000
commit04be992edc9144899435e3863aa6a95c6a06c9de (patch)
tree4117658981a89481ca4f438b761a1e06b3de4280 /docker
parent4bfd7b2327d73fb1ec77c56bb498d6f0e62cfbc2 (diff)
parent73651aa9bbcf64af0529185d9abb81d1762a976b (diff)
Merge "Containers: disable downloading rabbitmqadmin"
Diffstat (limited to 'docker')
-rw-r--r--docker/services/rabbitmq.yaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index a04893e4..b42fdf5c 100644
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -48,7 +48,10 @@ outputs:
description: Role data for the Rabbitmq API role.
value:
service_name: {get_attr: [RabbitmqBase, role_data, service_name]}
- config_settings: {get_attr: [RabbitmqBase, role_data, config_settings]}
+ config_settings:
+ map_merge:
+ - {get_attr: [RabbitmqBase, role_data, config_settings]}
+ - rabbitmq::admin_enable: false
step_config: &step_config
get_attr: [RabbitmqBase, role_data, step_config]
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}