diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-08-25 15:48:42 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-11-04 19:57:22 -0500 |
| commit | 037d77599632faa81f0c6ca1e912a19f04628b55 (patch) | |
| tree | 7ab363e97bf9e6acc4bc609b7e9bf0ebbba24f05 | |
| parent | ac0f4cb56e1469e9033e3a218265bc70f774624d (diff) | |
| download | openshift-037d77599632faa81f0c6ca1e912a19f04628b55.tar.gz openshift-037d77599632faa81f0c6ca1e912a19f04628b55.tar.bz2 openshift-037d77599632faa81f0c6ca1e912a19f04628b55.tar.xz openshift-037d77599632faa81f0c6ca1e912a19f04628b55.zip | |
more tweaks
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 67068e001..9de72fcde 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -246,6 +246,7 @@ - name: Configure master instances hosts: oo_masters_to_config + serial: 1 vars: named_certificates: "{{ hostvars[groups['oo_first_master'][0]]['parsed_named_certificates'] | default([])}}" sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 00aaa2e57..085855750 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -209,15 +209,17 @@ when: openshift_master_ha | bool register: start_result -# TODO: work to eliminate this workaround -- name: pause a random interval to avoid startup errors for controller - pause: seconds={{ 60 | random(step=5) }} +- name: pause to prevent service restart from interfering with bootstrapping + pause: seconds=30 when: openshift_master_ha | bool +# TODO: fix the ugly workaround of setting ignore_errors +# the controllers service tries to start even if it is already started - name: Start and enable master controller service: name={{ openshift.common.service_type }}-master-controllers enabled=yes state=started when: openshift_master_ha | bool register: start_result + ignore_errors: yes - set_fact: master_service_status_changed = start_result | changed |