openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Jiri Stransky 2017-04-19 17:02:15 +02:00
parent 56c8f12077
commit 73651aa9bb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/services/rabbitmq.yaml
View File

@ -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]}