diff options
| author | Michael Gugino <mgugino@redhat.com> | 2018-01-25 13:25:49 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2018-01-25 13:25:49 -0500 |
| commit | 4f7d963986a1e28ecc6abd15532b0c1aece99be1 (patch) | |
| tree | 6b405ee61567f27344f37ee6be6a01097cbab8da /playbooks/openshift-master/private/config.yml | |
| parent | 6c921b0877c38c2a6e55cd5852a740ec88fde8fb (diff) | |
| download | openshift-4f7d963986a1e28ecc6abd15532b0c1aece99be1.tar.gz openshift-4f7d963986a1e28ecc6abd15532b0c1aece99be1.tar.bz2 openshift-4f7d963986a1e28ecc6abd15532b0c1aece99be1.tar.xz openshift-4f7d963986a1e28ecc6abd15532b0c1aece99be1.zip | |
Remove master_ha bool checks
Most of these checks are no longer applicable to
the tasks on which they are applied.
This commit removes incorrect ha checks to ensure
services are restarted at appropriate times.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500897
Diffstat (limited to 'playbooks/openshift-master/private/config.yml')
| -rw-r--r-- | playbooks/openshift-master/private/config.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/playbooks/openshift-master/private/config.yml b/playbooks/openshift-master/private/config.yml index 153ea9993..d2fc2eed8 100644 --- a/playbooks/openshift-master/private/config.yml +++ b/playbooks/openshift-master/private/config.yml @@ -78,7 +78,6 @@ console_url: "{{ openshift_master_console_url | default(None) }}" console_use_ssl: "{{ openshift_master_console_use_ssl | default(None) }}" public_console_url: "{{ openshift_master_public_console_url | default(None) }}" - ha: "{{ openshift_master_ha | default(groups.oo_masters | length > 1) }}" master_count: "{{ openshift_master_count | default(groups.oo_masters | length) }}" - name: Inspect state of first master config settings @@ -166,7 +165,6 @@ hosts: oo_masters_to_config any_errors_fatal: true vars: - openshift_master_ha: "{{ openshift.master.ha }}" openshift_master_count: "{{ openshift.master.master_count }}" openshift_master_session_auth_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_auth_secrets }}" openshift_master_session_encryption_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_encryption_secrets }}" @@ -186,6 +184,7 @@ - role: openshift_buildoverrides - role: nickhammond.logrotate - role: openshift_master + openshift_master_ha: "{{ (groups.oo_masters | length > 1) | bool }}" openshift_master_hosts: "{{ groups.oo_masters_to_config }}" r_openshift_master_clean_install: "{{ hostvars[groups.oo_first_master.0].l_clean_install }}" r_openshift_master_etcd3_storage: "{{ hostvars[groups.oo_first_master.0].l_etcd3_enabled }}" |