diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-14 13:09:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 13:09:41 -0800 |
| commit | deb9a793cbb169b964424720f9c3a6ce6b976b09 (patch) | |
| tree | a5bf67b272a8ba7829eb2ba0d3eaeface0909a32 /playbooks/openshift-master | |
| parent | b90ec246f78ac66c4251996f9bb288875765ccaf (diff) | |
| parent | cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa (diff) | |
| download | openshift-deb9a793cbb169b964424720f9c3a6ce6b976b09.tar.gz openshift-deb9a793cbb169b964424720f9c3a6ce6b976b09.tar.bz2 openshift-deb9a793cbb169b964424720f9c3a6ce6b976b09.tar.xz openshift-deb9a793cbb169b964424720f9c3a6ce6b976b09.zip | |
Merge pull request #7124 from mgugino-upstream-stage/fix-version-multi
Automatic merge from submit-queue.
Fix version multi
Simplify double upgrade version logic
Currently, double upgrade process (3.7 -> 3.9)
for control plane attempts to run openshift_version
role twice to set the appropriate values for
upgrading each major version, 3.8 and 3.9.
This commit instructs openshift_version to
only inquire about the proper settings for 3.9,
and hard-sets the appropriate values for 3.8.
This allows a simplification of the
openshift_version role, allowing for easier
debugging.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542368
Diffstat (limited to 'playbooks/openshift-master')
| -rw-r--r-- | playbooks/openshift-master/private/validate_restart.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/playbooks/openshift-master/private/validate_restart.yml b/playbooks/openshift-master/private/validate_restart.yml index 60b0e5bb6..40aaa653c 100644 --- a/playbooks/openshift-master/private/validate_restart.yml +++ b/playbooks/openshift-master/private/validate_restart.yml @@ -33,6 +33,7 @@ - stat: path="{{ hostvars.localhost.mktemp.stdout }}" register: exists changed_when: false + when: "'stdout' in hostvars.localhost.mktemp" - name: Cleanup temp file on localhost hosts: localhost @@ -41,6 +42,7 @@ tasks: - file: path="{{ hostvars.localhost.mktemp.stdout }}" state=absent changed_when: false + when: "'stdout' in hostvars.localhost.mktemp" - name: Warn if restarting the system where ansible is running hosts: oo_masters_to_config @@ -54,7 +56,9 @@ must be verified manually. To only restart services, set openshift_master_rolling_restart_mode=services in host inventory and relaunch the playbook. - when: exists.stat.exists and openshift.common.rolling_restart_mode == 'system' + when: + - "'stat' in exists" + - exists.stat.exists and openshift.common.rolling_restart_mode == 'system' - set_fact: current_host: "{{ exists.stat.exists }}" when: openshift.common.rolling_restart_mode == 'system' |