From ff4db0db59184d23795ffde209974c9f57a63e2a Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Wed, 26 Apr 2017 10:29:18 +0200
Subject: Change the default for rabbitmq back to ha-mode: all

In change Ib62001c03e1e08f58cf0c6e0ba07a8879a584084 we switched the
rabbitmq queues HA mode from ha-all to ha-exactly. While this gives us a
nice performance boost with rabbitmq, it makes rabbit less resilient to
network glitches as we painfully found out via
https://bugzilla.redhat.com/show_bug.cgi?id=1441635.

This is the THT part of the change that changes the default to
ha-mode: all.

NB: not clean cherry-pick due to the added metadata_settings line in
master

Closes-Bug: #1686337
Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com>
Co-Authored-By: John Eckersberg <jeckersb@redhat.com>

Change-Id: I7afcf2b3c8deb13fc2134e4cae9c06a44e775384
Depends-On: I9a90e71094b8d8d58b5be0a45a2979701b0ac21c
(cherry picked from commit 90fc4b2e27ef6f612a82dfc5e08884629d0fe0bf)
---
 puppet/services/pacemaker/rabbitmq.yaml | 29 -----------------------------
 puppet/services/rabbitmq.yaml           |  8 ++++----
 2 files changed, 4 insertions(+), 33 deletions(-)

(limited to 'puppet/services')

diff --git a/puppet/services/pacemaker/rabbitmq.yaml b/puppet/services/pacemaker/rabbitmq.yaml
index b018df35..03c2c83f 100644
--- a/puppet/services/pacemaker/rabbitmq.yaml
+++ b/puppet/services/pacemaker/rabbitmq.yaml
@@ -39,32 +39,3 @@ 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
diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml
index 2c4ccbc9..bc03c42e 100644
--- a/puppet/services/rabbitmq.yaml
+++ b/puppet/services/rabbitmq.yaml
@@ -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'
-- 
cgit 1.2.3-korg