X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Frabbitmq.yaml;h=b018df359d67d584299d09ef8986c262ae07306b;hb=46aeff751500474a67854f9d407263c9b6dd4abf;hp=b01caeeadcd97ba1cc1f4b8db7b5597a62648a9f;hpb=aa71f16a69f063f9a23377271c7cd17a0c4195cc;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/rabbitmq.yaml b/puppet/services/pacemaker/rabbitmq.yaml
index b01caeea..b018df35 100644
--- a/puppet/services/pacemaker/rabbitmq.yaml
+++ b/puppet/services/pacemaker/rabbitmq.yaml
@@ -1,9 +1,18 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   RabbitMQ service with Pacemaker configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -14,6 +23,8 @@ resources:
   RabbitMQServiceBase:
     type: ../rabbitmq.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -21,9 +32,39 @@ outputs:
     description: Role data for the RabbitMQ pacemaker role.
     value:
       service_name: rabbitmq
+      monitoring_subscription: {get_attr: [RabbitMQServiceBase, role_data, monitoring_subscription]}
       config_settings:
         map_merge:
           - get_attr: [RabbitMQServiceBase, role_data, config_settings]
           - 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