Merge "Add missing xinetd/rsync container for Swift"

[apex-tripleo-heat-templates.git] / puppet / services / pacemaker / rabbitmq.yaml

diff --git a/puppet/services/pacemaker/rabbitmq.yaml b/puppet/services/pacemaker/rabbitmq.yaml
index caada95..7925720 100644 (file)
--- a/puppet/services/pacemaker/rabbitmq.yaml
+++ b/puppet/services/pacemaker/rabbitmq.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   RabbitMQ service with Pacemaker configured with Puppet
@@ -13,6 +13,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -26,6 +34,8 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
@@ -39,34 +49,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]