summaryrefslogtreecommitdiffstats
path: root/docker/services
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2017-04-19 17:02:15 +0200
committerJiri Stransky <jistr@redhat.com>2017-04-19 17:05:45 +0200
commit73651aa9bbcf64af0529185d9abb81d1762a976b (patch)
tree2fcb450330c743cd592aac44d0abc8b70af022eb /docker/services
parent56c8f120770b63b5518d3738ed56de626d24eb80 (diff)
Containers: disable downloading rabbitmqadmin
There's no need for puppet to download rabbitmqadmin script from rabbitmq, as the script would be immediately deleted together with the ephemeral puppet container. Also, since rabbitmq isn't running at the time we run the puppet container (rabbitmq doesn't have config files generated at that point), puppet couldn't connect to rabbitmq anyway. Change-Id: Ia59e1013c24ab02037246135024418cc9b674606 Closes-Bug: #1684104
Diffstat (limited to 'docker/services')
-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]}