diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-15 13:32:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 13:32:04 -0800 |
| commit | acdd5e905be2605138143a970899672634492ecf (patch) | |
| tree | a6b9fb03b8fe2c7e6acd98f16cf4602888607d1d /playbooks/common/openshift-master | |
| parent | 763f604fccb71971cd6fda3ae63312233bbe1d4e (diff) | |
| parent | 4877e1c21a26d2aba314e6272478005d12b7f14b (diff) | |
| download | openshift-acdd5e905be2605138143a970899672634492ecf.tar.gz openshift-acdd5e905be2605138143a970899672634492ecf.tar.bz2 openshift-acdd5e905be2605138143a970899672634492ecf.tar.xz openshift-acdd5e905be2605138143a970899672634492ecf.zip | |
Merge pull request #6084 from mgugino-upstream-stage/combine-master-upgrade
Automatic merge from submit-queue.
Combine master upgrade play with role
Currently, there are plays importing tasks directly from
openshift_master role. This has caused numerous bugs
and code duplicaiton in the past.
This commit combines the upgrade into openshift_master role
utilizing include_role syntax.
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/restart_services.yml | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/playbooks/common/openshift-master/restart_services.yml b/playbooks/common/openshift-master/restart_services.yml index 4f8b758fd..4e1b3a3be 100644 --- a/playbooks/common/openshift-master/restart_services.yml +++ b/playbooks/common/openshift-master/restart_services.yml @@ -1,22 +1,4 @@ --- -- name: Restart master API - service: - name: "{{ openshift.common.service_type }}-master-api" - state: restarted - when: openshift_master_ha | bool -- name: Wait for master API to come back online - wait_for: - host: "{{ openshift.common.hostname }}" - state: started - delay: 10 - port: "{{ openshift.master.api_port }}" - timeout: 600 - when: openshift_master_ha | bool -- name: Restart master controllers - service: - name: "{{ openshift.common.service_type }}-master-controllers" - state: restarted - # Ignore errrors since it is possible that type != simple for - # pre-3.1.1 installations. - ignore_errors: true - when: openshift_master_ha | bool +- include_role: + name: openshift_master + tasks_from: restart.yml |