diff options
author | Jason DeTiberus <detiber@gmail.com> | 2015-11-06 15:58:56 -0500 |
---|---|---|
committer | Jason DeTiberus <detiber@gmail.com> | 2015-11-06 15:58:56 -0500 |
commit | eec5e61daf1bd0ef773c21180ae642fafe23e3df (patch) | |
tree | a24e8fcc383735ceb801e0ac7369a7b2a61d72f3 /roles/openshift_master | |
parent | e250f4712eecace09ee37bcfa116206e765d0076 (diff) | |
parent | aa0746600ed64b2b2f61eb83f634bccdfa4c5be2 (diff) | |
download | openshift-eec5e61daf1bd0ef773c21180ae642fafe23e3df.tar.gz openshift-eec5e61daf1bd0ef773c21180ae642fafe23e3df.tar.bz2 openshift-eec5e61daf1bd0ef773c21180ae642fafe23e3df.tar.xz openshift-eec5e61daf1bd0ef773c21180ae642fafe23e3df.zip |
Merge pull request #52 from abutcher/pcs-restart-master3
Wait for cluster to recover after pcs resource restart.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 35570923c..185bfb8f3 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -207,6 +207,7 @@ line: "OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen=https://0.0.0.0:8443 --master=https://{{ openshift.common.ip }}:8443" - regex: '^CONFIG_FILE=' line: "CONFIG_FILE={{ openshift_master_config_file }}" + when: openshift_master_ha | bool and openshift_master_cluster_method == "native" notify: - restart master api @@ -220,6 +221,7 @@ line: "OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen=https://0.0.0.0:8444" - regex: '^CONFIG_FILE=' line: "CONFIG_FILE={{ openshift_master_config_file }}" + when: openshift_master_ha | bool and openshift_master_cluster_method == "native" notify: - restart master controllers |