openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "puppet_config for rabbitmq_bundle needs file_line"

This commit is contained in:
Zuul 2018-12-19 15:46:30 +00:00 committed by Gerrit Code Review
parent 7e1a0a9014 34aa23814e
commit 24a63061aa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/services/pacemaker/rabbitmq.yaml
View File

@ -109,12 +109,12 @@ outputs:
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: rabbitmq
puppet_tags: file
puppet_tags: 'file,file_line'
step_config:
list_join:
- "\n"
- - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
- get_attr: [RabbitmqBase, role_data, step_config]
- "include ::tripleo::profile::pacemaker::rabbitmq_bundle"
config_image: {get_param: DockerRabbitmqConfigImage}
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json:

4
docker/services/pacemaker/rpc-rabbitmq.yaml
View File

@ -110,12 +110,12 @@ outputs:
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: rabbitmq
puppet_tags: file
puppet_tags: 'file,file_line'
step_config:
list_join:
- "\n"
- - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
- get_attr: [RabbitmqBase, role_data, step_config]
- "include ::tripleo::profile::pacemaker::rabbitmq_bundle"
config_image: {get_param: DockerRabbitmqConfigImage}
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json: