diff options
author | 2017-03-06 10:32:52 +0000 | |
---|---|---|
committer | 2017-03-06 10:32:52 +0000 | |
commit | 47fcabee464b1e46490087316778b3cff0a55b5b (patch) | |
tree | f15d5fcafa2835131da9d13209930d98175cdfa9 /docker/services/rabbitmq.yaml | |
parent | ccb13e7b4227188275cb3f8e599fa8f6f37639c0 (diff) | |
parent | 610850140d605b18f4a28099f160fff1e489443d (diff) |
Merge "Put docker puppet config in puppet_config dict"
Diffstat (limited to 'docker/services/rabbitmq.yaml')
-rw-r--r-- | docker/services/rabbitmq.yaml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml index cea3d8a7..aa604439 100644 --- a/docker/services/rabbitmq.yaml +++ b/docker/services/rabbitmq.yaml @@ -46,16 +46,19 @@ outputs: value: service_name: {get_attr: [RabbitmqBase, role_data, service_name]} config_settings: {get_attr: [RabbitmqBase, role_data, config_settings]} - step_config: {get_attr: [RabbitmqBase, role_data, step_config]} + step_config: &step_config + get_attr: [RabbitmqBase, role_data, step_config] service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS docker_image: &rabbitmq_image list_join: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqImage} ] - puppet_tags: file - config_volume: rabbitmq - config_image: *rabbitmq_image + puppet_config: + config_volume: rabbitmq + puppet_tags: file + step_config: *step_config + config_image: *rabbitmq_image kolla_config: /var/lib/kolla/config_files/rabbitmq.json: command: /usr/lib/rabbitmq/bin/rabbitmq-server |