diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-06-08 09:08:17 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-06-08 09:08:17 -0400 |
| commit | 9553b9173d951de39b52a03688ea6f7aff7291d4 (patch) | |
| tree | efae1f93ecdbe172fe38aaf44b0414ce4da3ab1f /playbooks/common/openshift-cluster/upgrades/v3_1_minor | |
| parent | 377405b67551ef51ce6f644bde018986465a1e0c (diff) | |
| parent | a2fad7dd125bb4f1b0123beab81cbff9075397d4 (diff) | |
| download | openshift-9553b9173d951de39b52a03688ea6f7aff7291d4.tar.gz openshift-9553b9173d951de39b52a03688ea6f7aff7291d4.tar.bz2 openshift-9553b9173d951de39b52a03688ea6f7aff7291d4.tar.xz openshift-9553b9173d951de39b52a03688ea6f7aff7291d4.zip | |
Merge pull request #1964 from sdodson/fix-proxy-smashing
Preserve proxy config if it exists in the sysconfig files but is undefined in our config
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/v3_1_minor')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml index 66935e061..85d7073f2 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml @@ -29,7 +29,7 @@ valid version for a {{ target_version }} upgrade when: openshift_pkg_version is defined and openshift_pkg_version.split('-',1).1 | version_compare(target_version ,'<') -- name: Verify upgrade can proceed +- name: Verify upgrade targets hosts: oo_masters_to_config:oo_nodes_to_config vars: target_version: "{{ '1.1.1' if deployment_type == 'origin' else '3.1.1' }}" |