From a87e9264904fbb6111cd137e820cfb935055ec7f Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Tue, 21 Feb 2017 18:59:01 +0300 Subject: [PATCH] Revert: Scale controllers up/down using pacemaker m-mode Revert adding the cluster_mm and cluster_mm_off tasks which turn the maintenance mode on the cluster nodes. Change-Id: I6fe7b24d5fb4610ae33ecaabfb6648efabc32dfc Releted-Bug: 1661177 --- .../osnailyfacter/modular/astute/tasks.yaml | 12 ------------ .../osnailyfacter/modular/cluster/tasks.yaml | 17 ----------------- 2 files changed, 29 deletions(-) diff --git a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml index 16c994d53d..177720029a 100644 --- a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml +++ b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml @@ -154,18 +154,6 @@ timeout: 120 cwd: / -- id: cluster_mm_off - type: shell - version: 2.1.0 - role: [primary-controller, controller] - condition: - yaql_exp: "changedAny($.network_metadata.nodes.keys(), $.get('corosync_roles'))" - requires: [post_deployment_start] - required_for: [enable_quorum] - parameters: - cmd: crm node ready - timeout: 120 - #PRE DEPLOYMENT - id: rsync_core_puppet type: sync diff --git a/deployment/puppet/osnailyfacter/modular/cluster/tasks.yaml b/deployment/puppet/osnailyfacter/modular/cluster/tasks.yaml index c8e216343f..328aa7baa0 100644 --- a/deployment/puppet/osnailyfacter/modular/cluster/tasks.yaml +++ b/deployment/puppet/osnailyfacter/modular/cluster/tasks.yaml @@ -56,20 +56,3 @@ timeout: 600 test_post: cmd: ruby /etc/puppet/modules/osnailyfacter/modular/cluster/health_post.rb - -- id: cluster_mm - type: shell - version: 2.1.0 - groups: [primary-controller, controller] - requires: [primary-cluster, cluster] - required_for: [deploy_end] - condition: - yaql_exp: > - $.status = 'ready' and - changedAny($.network_metadata.nodes.keys(), $.get('corosync_roles')) and - not changed($.get('configuration', {})) - cross-depended-by: - - name: /^(primary-)?(database|rabbitmq)$/ - parameters: - cmd: crm node maintenance - timeout: 120