summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-07 16:25:29 -0800
committerGitHub <noreply@github.com>2018-02-07 16:25:29 -0800
commit52403c8d9ab6e604fb0060250526ae8c1587c269 (patch)
treee6c8ab29e27217adc2d763fd866097a4bd34b9c7 /playbooks/common/openshift-cluster/upgrades
parent178a71a0952adc5a4137f2c0acae8e5d2cf71c62 (diff)
parentb683605bd97a798589000d32d1b9ea15bf75666d (diff)
downloadopenshift-52403c8d9ab6e604fb0060250526ae8c1587c269.tar.gz
openshift-52403c8d9ab6e604fb0060250526ae8c1587c269.tar.bz2
openshift-52403c8d9ab6e604fb0060250526ae8c1587c269.tar.xz
openshift-52403c8d9ab6e604fb0060250526ae8c1587c269.zip
Merge pull request #7017 from mtnbikenc/fix-1540537
Automatic merge from submit-queue. [1540537] Add base package installation to upgrade playbooks Hosts will need python ipaddress module installed if it was not installed during initial installation. Bug 1540537 https://bugzilla.redhat.com/show_bug.cgi?id=1540537
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/init.yml1
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml
index ba783638d..a9a35b028 100644
--- a/playbooks/common/openshift-cluster/upgrades/init.yml
+++ b/playbooks/common/openshift-cluster/upgrades/init.yml
@@ -6,6 +6,7 @@
g_new_node_hosts: []
- import_playbook: ../../../init/basic_facts.yml
+- import_playbook: ../../../init/base_packages.yml
- import_playbook: ../../../init/cluster_facts.yml
- name: Ensure firewall is not switched during upgrade
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
index d0ed46a18..9c7677f1b 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_9/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_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
+ l_base_packages_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
## Check to see if they're running 3.7 and if so upgrade them to 3.8 on control plan
## If they've specified pkg_version or image_tag preserve that for later use