openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add noop's for docker pacemaker for rabbitmq 

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.

NB: Cherry pick not 100% clean due to I7dc7cfae3ef1965ec95b1d9ef23e7f162418c034
    which removed '*step_config' in master. We do need to remove it.

Closes-Bug: #1735852
Change-Id: I05c6fd7e48c3d28ab28d714f25e08e43318774b7
(cherry picked from commit f64eabfdf5)
This commit is contained in:
James Slagle 2017-12-01 17:48:58 -05:00 committed by Michele Baldessari
parent 2bfdb730e7
commit 7517de0405
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,11 @@ outputs:
puppet_config:
config_volume: rabbitmq
puppet_tags: file
step_config: *step_config
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}
kolla_config:
/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.