summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-19 18:46:48 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-19 18:46:48 -0500
commitc473a90f4abe887a1a94819e2feac8dcd29dc839 (patch)
tree9c736326cf4b76e119174d3374c0c63f62d72176 /playbooks/common/openshift-cluster/upgrades
parentfabc75ca725c6a561bc5e70a63c4dbb2d37bc396 (diff)
parent48778f29f265380a3e6fa2e882621ebc3781736b (diff)
downloadopenshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.gz
openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.bz2
openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.xz
openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.zip
Merge pull request #808 from sdodson/containers
Containerized install with SDN support
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
index fc098b4ed..1f9c6afd3 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
@@ -235,6 +235,7 @@
- name: Ensure python-yaml present for config upgrade
action: "{{ ansible_pkg_mgr }} name=PyYAML state=present"
+ when: not openshift.common.is_atomic | bool
- name: Upgrade master configuration
openshift_upgrade_config: