diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-17 13:32:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 13:32:27 -0500 |
| commit | b58e8c1136725db9ce11d01e01e42575ee25ab44 (patch) | |
| tree | c8baaf478cb96b21ed769be545be8de6cccc39c5 /playbooks/common/openshift-cluster/upgrades/v3_8 | |
| parent | 2e1a1328457315c0d434d5a0fe1660e07512f6bd (diff) | |
| parent | dd9a27ad1448b2c953b0b45a46dba83f77cc5ad5 (diff) | |
| download | openshift-b58e8c1136725db9ce11d01e01e42575ee25ab44.tar.gz openshift-b58e8c1136725db9ce11d01e01e42575ee25ab44.tar.bz2 openshift-b58e8c1136725db9ce11d01e01e42575ee25ab44.tar.xz openshift-b58e8c1136725db9ce11d01e01e42575ee25ab44.zip | |
Merge pull request #6520 from sdodson/37-38-39
Faciliate 3.7 to 3.8 to 3.9 upgrade
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/v3_8')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml index 0f74e0137..a9bf354cc 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml @@ -35,8 +35,6 @@ # Pre-upgrade completed - import_playbook: ../upgrade_control_plane.yml - vars: - master_config_hook: "v3_7/master_config_upgrade.yml" # All controllers must be stopped at the same time then restarted - name: Cycle all controller services to force new leader election mode diff --git a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml index a2f316c25..51da45311 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml @@ -15,6 +15,7 @@ vars: l_upgrade_no_switch_firewall_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config" l_upgrade_non_node_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config" + when: not skip_version_info | default(false) - name: Configure the upgrade target for the common upgrade tasks hosts: oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config @@ -47,8 +48,6 @@ # Pre-upgrade completed - import_playbook: ../upgrade_control_plane.yml - vars: - master_config_hook: "v3_7/master_config_upgrade.yml" # All controllers must be stopped at the same time then restarted - name: Cycle all controller services to force new leader election mode |