summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-25 08:04:33 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-25 08:04:33 -0500
commitfe11306eaef8131752c6f3ee202323836a6719cd (patch)
treeb3b62d812de0d3821d46b74f61da6d7d9df3ee34 /playbooks/common/openshift-cluster
parent72d7e9478812655d6034edcf7e41bec4129fc70b (diff)
parent2b4aad9db8118a67710ad6cb5bed70afff292e82 (diff)
downloadopenshift-fe11306eaef8131752c6f3ee202323836a6719cd.tar.gz
openshift-fe11306eaef8131752c6f3ee202323836a6719cd.tar.bz2
openshift-fe11306eaef8131752c6f3ee202323836a6719cd.tar.xz
openshift-fe11306eaef8131752c6f3ee202323836a6719cd.zip
Merge pull request #1469 from talset/playbook_upgrade
Add missing is_atomic condition in the upgrade playbook
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml4
1 files changed, 3 insertions, 1 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 dbf746f12..54bb251f7 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
@@ -13,10 +13,11 @@
tasks:
- name: Upgrade master packages
command: "{{ ansible_pkg_mgr}} update -y {{ openshift.common.service_type }}-master{{ openshift_version }}"
+ when: not openshift.common.is_containerized | bool
- name: Ensure python-yaml present for config upgrade
action: "{{ ansible_pkg_mgr }} name=PyYAML state=present"
- when: not openshift.common.is_atomic | bool
+ when: not openshift.common.is_containerized | bool
# Currently 3.1.1 does not have any new configuration settings
#
@@ -63,6 +64,7 @@
tasks:
- name: Upgrade node packages
command: "{{ ansible_pkg_mgr }} update -y {{ openshift.common.service_type }}-node{{ openshift_version }}"
+ when: not openshift.common.is_containerized | bool
- name: Restart node service
service: name="{{ openshift.common.service_type }}-node" state=restarted