openstack/tripleo-heat-templates
Code Issues Proposed changes

Add noop's for docker pacemaker for rabbitmq

Browse Source 
The pacemaker docker version for the rabbitmq service should also
include the noop's for the for Rabbitmq_policy and Rabbitmq_user puppet
resources that are noop'd in docker/services/rabbitmq.yaml

These resources must be noop'd in puppet, otherwise they could be
triggered during puppet apply's during the docker-puppet.py generate
config step where rabbitmqctl is not actually running.

Closes-Bug: #1735852
Change-Id: I05c6fd7e48c3d28ab28d714f25e08e43318774b7
This commit is contained in:
James Slagle 2017-12-01 17:48:58 -05:00 committed by Emilien Macchi
parent f253c0d08d
commit f64eabfdf5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,10 @@ outputs:
config_volume: rabbitmq config_volume: rabbitmq
puppet_tags: file puppet_tags: file
step_config: step_config:
get_attr: [RabbitmqBase, role_data, step_config] list_join:
- "\n"
- - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
- get_attr: [RabbitmqBase, role_data, step_config]
config_image: {get_param: DockerRabbitmqConfigImage} config_image: {get_param: DockerRabbitmqConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/rabbitmq.json: /var/lib/kolla/config_files/rabbitmq.json:

8
releasenotes/notes/pacemaker-rabbitmq-b1b5fc2b47cb84e4.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
-- The pacemaker docker version for the rabbitmq service should also
include the noop's for the for Rabbitmq_policy and Rabbitmq_user puppet
resources that are noop'd in docker/services/rabbitmq.yaml These resources
must be noop'd in puppet, otherwise they could be triggered during puppet
apply's during the docker-puppet.py generate config step where rabbitmqctl
is not actually running.