Merge "Change the default for rabbitmq back to ha-mode: all"

This commit is contained in:
Jenkins 2017-04-27 19:20:24 +00:00 committed by Gerrit Code Review
commit d3f842ecd0
3 changed files with 15 additions and 33 deletions

View File

@ -39,34 +39,5 @@ outputs:
- rabbitmq::service_manage: false
step_config: |
include ::tripleo::profile::pacemaker::rabbitmq
upgrade_tasks:
- name: get bootstrap nodeid
tags: common
command: hiera bootstrap_nodeid
register: bootstrap_node
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{bootstrap_node.stdout == ansible_hostname}}
- name: get rabbitmq policy
tags: common
shell: pcs resource show rabbitmq | grep -q -E "Attributes:.*\"ha-mode\":\"all\""
register: rabbit_ha_mode
when: is_bootstrap_node
ignore_errors: true
- name: set migrate_rabbit_ha_mode fact
tags: common
set_fact: migrate_rabbit_ha_mode={{rabbit_ha_mode.rc == 0}}
when: is_bootstrap_node
- name: Fixup for rabbitmq ha-queues LP#1668600
tags: step0,pre-upgrade
shell: |
nr_controllers=$(($(hiera controller_node_names | grep -o "," |wc -l) + 1))
nr_queues=$(($nr_controllers / 2 + ($nr_controllers % 2)))
if ! [ $nr_queues -gt 0 -a $nr_queues -le $nr_controllers ]; then
echo "ERROR: The nr. of HA queues during the rabbit upgrade is out of range: $nr_queues"
exit 1
fi
pcs resource update rabbitmq set_policy='ha-all ^(?!amq\\.).* {"ha-mode":"exactly","ha-params":'"$nr_queues}" --wait=600
when: is_bootstrap_node and migrate_rabbit_ha_mode
metadata_settings:
get_attr: [RabbitMQServiceBase, role_data, metadata_settings]

View File

@ -40,10 +40,10 @@ parameters:
hidden: true
RabbitHAQueues:
description:
The number of HA queues to be configured in rabbit. The default is 0 which will
be automatically overridden to CEIL(N/2) where N is the number of nodes running
rabbitmq.
default: 0
The number of HA queues to be configured in rabbit. The default is -1 which
translates to "ha-mode all". The special value 0 will be automatically
overridden to CEIL(N/2) where N is the number of nodes running rabbitmq.
default: -1
type: number
MonitoringSubscriptionRabbitmq:
default: 'overcloud-rabbitmq'

View File

@ -0,0 +1,11 @@
---
upgrade:
- |
We are not changing the rabbitmq ha-mode policy during upgrades any longer.
The policy chosen at deploy time will remain the same but can be changed
manually.
fixes:
- |
Due to https://bugs.launchpad.net/tripleo/+bug/1686337 we switch the
default of rabbitmq back ha-mode "all". This is to make the installation
more robust in the face of network issues.