diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-08 17:19:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-08 17:19:38 -0400 |
| commit | 2594364683976584c7654fee480a2ec5501dca59 (patch) | |
| tree | dad8a33df9a39b33c965087494cbcad5e959d06b /playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml | |
| parent | 9090df2d6c526d570d33d2315d90d80cc105750b (diff) | |
| parent | b3d04f1a54c0109ce38be103ddc7c83f1992c10e (diff) | |
| download | openshift-2594364683976584c7654fee480a2ec5501dca59.tar.gz openshift-2594364683976584c7654fee480a2ec5501dca59.tar.bz2 openshift-2594364683976584c7654fee480a2ec5501dca59.tar.xz openshift-2594364683976584c7654fee480a2ec5501dca59.zip | |
Merge pull request #2211 from dgoodwin/33-upgrade-playbook
1.3 / 3.3 Upgrades
Diffstat (limited to 'playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml')
| -rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml index e28313221..5d549eee7 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml @@ -47,11 +47,19 @@ openshift_docker_log_options: "{{ lookup('oo_option', 'docker_log_options') }}" when: openshift_docker_log_options is not defined -- include: ../../../../common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml + +# Configure the upgrade target for the common upgrade tasks: +- hosts: l_oo_all_hosts + tasks: + - set_fact: + openshift_upgrade_target: "{{ '1.2' if deployment_type == 'origin' else '3.2' }}" + openshift_upgrade_min: "{{ '1.1' if deployment_type == 'origin' else '3.1' }}" + +- include: ../../../../common/openshift-cluster/upgrades/pre.yml vars: openshift_deployment_type: "{{ deployment_type }}" -- include: ../../../../common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +- include: ../../../../common/openshift-cluster/upgrades/upgrade.yml vars: openshift_deployment_type: "{{ deployment_type }}" - include: ../../../openshift-master/restart.yml -- include: ../../../../common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml +- include: ../../../../common/openshift-cluster/upgrades/post.yml |