diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-09 11:50:51 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-09 11:50:51 -0300 |
| commit | 00eb0c79ed65543b3d358ae71b1a40fcbc88d78b (patch) | |
| tree | b791494908cd7341c420cc9c59dc6a2dd82db4a8 /playbooks/common/openshift-cluster/upgrades | |
| parent | 096cf64128ebcb1249044a1cb28b1b06154766ae (diff) | |
| parent | 078e5dca2d945fc789bce1f90432a19b6a8db75f (diff) | |
| download | openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.gz openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.bz2 openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.xz openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
3 files changed, 5 insertions, 5 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml index a72749a2b..3a4c58e43 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml @@ -54,7 +54,7 @@ - script: ../files/pre-upgrade-check -- name: Verify upgrade can proceed +- name: Verify upgrade targets hosts: oo_masters_to_config:oo_nodes_to_config vars: target_version: "{{ '1.1' if deployment_type == 'origin' else '3.1' }}" 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' }}" diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml index 03b4bd751..42641f2eb 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml @@ -72,7 +72,7 @@ openshift_release: "3.2" openshift_protect_installed_version: False -- name: Verify upgrade can proceed on masters +- name: Verify master processes hosts: oo_masters_to_config roles: - openshift_facts @@ -103,7 +103,7 @@ enabled: yes when: openshift.master.ha is defined and openshift.master.ha | bool and openshift.common.is_containerized | bool -- name: Verify upgrade can proceed on nodes +- name: Verify node processes hosts: oo_nodes_to_config roles: - openshift_facts @@ -115,7 +115,7 @@ enabled: yes when: openshift.common.is_containerized | bool -- name: Verify upgrade can proceed on masters and nodes +- name: Verify upgrade targets hosts: oo_masters_to_config:oo_nodes_to_config vars: target_version: "{{ '1.2' if deployment_type == 'origin' else '3.2' }}" |