summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-18 10:46:41 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-18 10:46:41 -0500
commit18e639f0249dba701e9f6c9bc4545db15927806d (patch)
tree2f9100a25387c206e2e1dcfb971e807275a84d78 /playbooks
parentff9172e36cc0857cb180d2ea003cf2ac53a9bb34 (diff)
parent5273611da653bca4a15cfe57e4acc57aef089a37 (diff)
downloadopenshift-18e639f0249dba701e9f6c9bc4545db15927806d.tar.gz
openshift-18e639f0249dba701e9f6c9bc4545db15927806d.tar.bz2
openshift-18e639f0249dba701e9f6c9bc4545db15927806d.tar.xz
openshift-18e639f0249dba701e9f6c9bc4545db15927806d.zip
Merge pull request #1204 from abutcher/restart-fixes
Restart Playbook Fixes
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-master/restart.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-master/restart.yml b/playbooks/common/openshift-master/restart.yml
index 987fae63c..d9d857b1a 100644
--- a/playbooks/common/openshift-master/restart.yml
+++ b/playbooks/common/openshift-master/restart.yml
@@ -73,12 +73,12 @@
command: >
systemctl is-active {{ openshift.common.service_type }}-master
register: active_check_output
- when: openshift.master.cluster_method == 'pacemaker'
- failed_when: active_check_output.stdout not in ['active', 'inactive']
+ when: openshift.master.cluster_method | default(None) == 'pacemaker'
+ failed_when: active_check_output.stdout not in ['active', 'inactive', 'unknown']
changed_when: false
- set_fact:
is_active: "{{ active_check_output.stdout == 'active' }}"
- when: openshift.master.cluster_method == 'pacemaker'
+ when: openshift.master.cluster_method | default(None) == 'pacemaker'
- name: Evaluate master groups
hosts: localhost