From edc7a0f4b9eb662a3eaf428a5816a3c00c541ee3 Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Tue, 8 Mar 2016 13:25:27 -0500 Subject: Bug 1315564 - upgrade to ose3.2 failed on Atomic Hosts --- playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml | 1 + playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 2 ++ 2 files changed, 3 insertions(+) (limited to 'playbooks') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml index 864622a09..66935e061 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml @@ -36,6 +36,7 @@ tasks: - name: Clean package cache command: "{{ ansible_pkg_mgr }} clean all" + when: not openshift.common.is_atomic | bool - set_fact: g_new_service_name: "{{ 'origin' if deployment_type =='origin' else 'atomic-openshift' }}" diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml index d2af4adbb..c9afca559 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml @@ -55,6 +55,7 @@ tasks: - name: Clean package cache command: "{{ ansible_pkg_mgr }} clean all" + when: not openshift.common.is_atomic | bool - set_fact: g_new_service_name: "{{ 'origin' if deployment_type =='origin' else 'atomic-openshift' }}" @@ -217,6 +218,7 @@ - name: Install etcd (for etcdctl) action: "{{ ansible_pkg_mgr }} name=etcd state=latest" + when: not openshift.common.is_atomic | bool - name: Generate etcd backup command: > -- cgit v1.2.1