diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-08 13:58:56 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-08 13:58:56 -0500 |
| commit | 7d36c01ffac88de0f32bf1ec7833cd66153f3098 (patch) | |
| tree | 51572b964256775f5c530a9f4b5c0463ba3f76cd | |
| parent | 13d249446afc9708d77c12dbe3fb6f0b4837b6aa (diff) | |
| parent | edc7a0f4b9eb662a3eaf428a5816a3c00c541ee3 (diff) | |
| download | openshift-7d36c01ffac88de0f32bf1ec7833cd66153f3098.tar.gz openshift-7d36c01ffac88de0f32bf1ec7833cd66153f3098.tar.bz2 openshift-7d36c01ffac88de0f32bf1ec7833cd66153f3098.tar.xz openshift-7d36c01ffac88de0f32bf1ec7833cd66153f3098.zip | |
Merge pull request #1566 from brenton/bz1315564
Bug 1315564 - upgrade to ose3.2 failed on Atomic Hosts
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_minor/pre.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 2 |
2 files changed, 3 insertions, 0 deletions
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: > |