openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix non-HA rabbitmq user password updates

Browse Source 
Fix the invocation of puppet's rabbitmq_user by allowing the
produced changes written into /var/lib/rabbitmq state.

Move the docker_puppet_tasks for non-HA rabbit into the step_2
as puppet-tripleo expects it for the rabbitmq_user call.

Related-bug: #1777939
Related-bug: #1778505

Depends-on: I55dc83acb2ed5ee07b4cf57e25135e6201589ac4
Change-Id: I7c7b2bd6d202268fdf4bc08f951ec4c9c4065c08
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya
2018-06-25 13:52:40 +03:00
parent c7b10fe834
commit f14369c085
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/services/messaging/notify-rabbitmq.yaml
View File

@@ -200,14 +200,14 @@ outputs:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
docker_puppet_tasks: docker_puppet_tasks:
# RabbitMQ users and policies initialization occurs only on single node # RabbitMQ users and policies initialization occurs only on single node
step_1: step_2:
config_volume: 'rabbit_init_tasks' config_volume: 'rabbit_init_tasks'
puppet_tags: 'rabbitmq_policy,rabbitmq_user' puppet_tags: 'rabbitmq_policy,rabbitmq_user'
step_config: 'include ::tripleo::profile::base::rabbitmq' step_config: 'include ::tripleo::profile::base::rabbitmq'
config_image: *rabbitmq_config_image config_image: *rabbitmq_config_image
volumes: volumes:
- /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq:ro - /var/lib/rabbitmq:/var/lib/rabbitmq
metadata_settings: metadata_settings:
get_attr: [RabbitmqBase, role_data, metadata_settings] get_attr: [RabbitmqBase, role_data, metadata_settings]
host_prep_tasks: host_prep_tasks:

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

@@ -200,14 +200,14 @@ outputs:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
docker_puppet_tasks: docker_puppet_tasks:
# RabbitMQ users and policies initialization occurs only on single node # RabbitMQ users and policies initialization occurs only on single node
step_1: step_2:
config_volume: 'rabbit_init_tasks' config_volume: 'rabbit_init_tasks'
puppet_tags: 'rabbitmq_policy,rabbitmq_user' puppet_tags: 'rabbitmq_policy,rabbitmq_user'
step_config: 'include ::tripleo::profile::base::rabbitmq' step_config: 'include ::tripleo::profile::base::rabbitmq'
config_image: *rabbitmq_config_image config_image: *rabbitmq_config_image
volumes: volumes:
- /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq:ro - /var/lib/rabbitmq:/var/lib/rabbitmq
metadata_settings: metadata_settings:
get_attr: [RabbitmqBase, role_data, metadata_settings] get_attr: [RabbitmqBase, role_data, metadata_settings]
host_prep_tasks: host_prep_tasks:

4
docker/services/rabbitmq.yaml
View File

@@ -199,14 +199,14 @@ outputs:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
docker_puppet_tasks: docker_puppet_tasks:
# RabbitMQ users and policies initialization occurs only on single node # RabbitMQ users and policies initialization occurs only on single node
step_1: step_2:
config_volume: 'rabbit_init_tasks' config_volume: 'rabbit_init_tasks'
puppet_tags: 'rabbitmq_policy,rabbitmq_user' puppet_tags: 'rabbitmq_policy,rabbitmq_user'
step_config: 'include ::tripleo::profile::base::rabbitmq' step_config: 'include ::tripleo::profile::base::rabbitmq'
config_image: *rabbitmq_config_image config_image: *rabbitmq_config_image
volumes: volumes:
- /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq:ro - /var/lib/rabbitmq:/var/lib/rabbitmq
metadata_settings: metadata_settings:
get_attr: [RabbitmqBase, role_data, metadata_settings] get_attr: [RabbitmqBase, role_data, metadata_settings]
host_prep_tasks: host_prep_tasks: