diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-07-20 11:09:28 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-07-20 11:09:28 -0400 |
| commit | 0cbeae4df062af3e2c1a4cb08ef3b4e742394ed6 (patch) | |
| tree | ff62328fb354ff303ca521f8619b4101d659e444 | |
| parent | dd186e74e05713a4337ebedbbbc77c4293d9cb3a (diff) | |
| parent | e60a11b97c83c29b8333d70cf4dcc86518cd150b (diff) | |
| download | openshift-0cbeae4df062af3e2c1a4cb08ef3b4e742394ed6.tar.gz openshift-0cbeae4df062af3e2c1a4cb08ef3b4e742394ed6.tar.bz2 openshift-0cbeae4df062af3e2c1a4cb08ef3b4e742394ed6.tar.xz openshift-0cbeae4df062af3e2c1a4cb08ef3b4e742394ed6.zip | |
Merge pull request #374 from detiber/ha_master
properly test openshift_master_ha var
| -rw-r--r-- | roles/openshift_master/handlers/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml index d57f9a4ea..f1e7e1ab3 100644 --- a/roles/openshift_master/handlers/main.yml +++ b/roles/openshift_master/handlers/main.yml @@ -1,4 +1,4 @@ --- - name: restart openshift-master service: name=openshift-master state=restarted - when: not openshift_master_ha + when: not openshift_master_ha | bool diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index bb1689e5f..057daabf9 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -10,7 +10,7 @@ - fail: msg: "openshift_master_cluster_password must be set for multi-master installations" - when: openshift_master_ha and not openshift.master.cluster_defer_ha | bool and openshift_master_cluster_password is not defined + when: openshift_master_ha | bool and not openshift.master.cluster_defer_ha | bool and openshift_master_cluster_password is not defined - name: Install OpenShift Master package yum: pkg=openshift-master state=present @@ -121,7 +121,7 @@ - name: Start and enable openshift-master service: name=openshift-master enabled=yes state=started - when: not openshift_master_ha + when: not openshift_master_ha | bool register: start_result - name: pause to prevent service restart from interfering with bootstrapping @@ -130,12 +130,12 @@ - name: Install cluster packages yum: pkg=pcs state=present - when: openshift_master_ha and not openshift.master.cluster_defer_ha | bool + when: openshift_master_ha | bool and not openshift.master.cluster_defer_ha | bool register: install_result - name: Start and enable cluster service service: name=pcsd enabled=yes state=started - when: openshift_master_ha and not openshift.master.cluster_defer_ha | bool + when: openshift_master_ha | bool and not openshift.master.cluster_defer_ha | bool - name: Set the cluster user password shell: echo {{ openshift_master_cluster_password | quote }} | passwd --stdin hacluster |