summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-05-17 13:27:57 -0400
committerJason DeTiberus <detiber@gmail.com>2016-05-17 13:27:57 -0400
commitfc33fa4733d95aa32a2844ac4d802aad9830e610 (patch)
treeec653eb2ba2920b717032a9a82ae51e982e2bce3
parentc86bdc4774db99ca0dba797edf0c6d6a2ea4cd24 (diff)
parentc7abd199a8a881b5c3f75277a7b7ab22050a902d (diff)
downloadopenshift-fc33fa4733d95aa32a2844ac4d802aad9830e610.tar.gz
openshift-fc33fa4733d95aa32a2844ac4d802aad9830e610.tar.bz2
openshift-fc33fa4733d95aa32a2844ac4d802aad9830e610.tar.xz
openshift-fc33fa4733d95aa32a2844ac4d802aad9830e610.zip
Merge pull request #1897 from sdodson/issue1435
Include sdn-ovs in upgrade commands to avoid pulling in newer packages
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
index 5e62b43a3..e5cfa58aa 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
@@ -12,7 +12,7 @@
openshift_version: "{{ openshift_pkg_version | default('') }}"
tasks:
- name: Upgrade master packages
- command: "{{ ansible_pkg_mgr}} update -y {{ openshift.common.service_type }}-master{{ openshift_version }}"
+ command: "{{ ansible_pkg_mgr}} update-to -y {{ openshift.common.service_type }}-master{{ openshift_version }} {{ openshift.common.service_type }}-sdn-ovs{{ openshift_version }}"
when: not openshift.common.is_containerized | bool
- name: Ensure python-yaml present for config upgrade
@@ -63,7 +63,7 @@
- openshift_facts
tasks:
- name: Upgrade node packages
- command: "{{ ansible_pkg_mgr }} update -y {{ openshift.common.service_type }}-node{{ openshift_version }}"
+ command: "{{ ansible_pkg_mgr }} update-to -y {{ openshift.common.service_type }}-node{{ openshift_version }} {{ openshift.common.service_type }}-sdn-ovs{{ openshift_version }}"
when: not openshift.common.is_containerized | bool
- name: Restart node service