diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-05 16:27:43 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-05 16:27:43 -0500 |
| commit | c73ec7b6b27483aea4bb53db0db9837ff9781d24 (patch) | |
| tree | 27ab3e06fe896997bf0f59b0ac3b6b54728f4425 /roles/openshift_master_cluster | |
| parent | d01f131de68bf88e4e3fb4c81450922a30285804 (diff) | |
| parent | 11e7783d4b4177f100ecea8a8ffafbfb07ec47ee (diff) | |
| download | openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.tar.gz openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.tar.bz2 openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.tar.xz openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.zip | |
Merge pull request #608 from abutcher/native-ha
Native Support for Multi-Master HA
Diffstat (limited to 'roles/openshift_master_cluster')
| -rw-r--r-- | roles/openshift_master_cluster/tasks/configure_deferred.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_master_cluster/tasks/main.yml | 5 |
2 files changed, 1 insertions, 12 deletions
diff --git a/roles/openshift_master_cluster/tasks/configure_deferred.yml b/roles/openshift_master_cluster/tasks/configure_deferred.yml deleted file mode 100644 index 3b416005b..000000000 --- a/roles/openshift_master_cluster/tasks/configure_deferred.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- debug: msg="Deferring config" - -- name: Start and enable the master - service: - name: "{{ openshift.common.service_type }}-master" - state: started - enabled: yes diff --git a/roles/openshift_master_cluster/tasks/main.yml b/roles/openshift_master_cluster/tasks/main.yml index 315947183..6303a6e46 100644 --- a/roles/openshift_master_cluster/tasks/main.yml +++ b/roles/openshift_master_cluster/tasks/main.yml @@ -4,10 +4,7 @@ register: pcs_status changed_when: false failed_when: false - when: not openshift.master.cluster_defer_ha | bool + when: openshift.master.cluster_method == "pacemaker" - include: configure.yml when: "pcs_status | failed and 'Error: cluster is not currently running on this node' in pcs_status.stderr" - -- include: configure_deferred.yml - when: openshift.master.cluster_defer_ha | bool |