From 0fd9b38ae3e358d7a05fc63c8ae23cfd7d7c5b27 Mon Sep 17 00:00:00 2001
From: talset <florian.lambert@enovance.com>
Date: Tue, 23 Feb 2016 13:35:35 +0100
Subject: Add missing is_atomic condition on upgrade package
* Update playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
* Add when not is_atomic on yum upgrade on master and node to be able to run the playbook on atomic host
---
playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml | 2 ++
1 file changed, 2 insertions(+)
(limited to 'playbooks/common/openshift-cluster')
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..2f67a3bc2 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
@@ -13,6 +13,7 @@
tasks:
- name: Upgrade master packages
command: "{{ ansible_pkg_mgr}} update -y {{ openshift.common.service_type }}-master{{ openshift_version }}"
+ when: not openshift.common.is_atomic | bool
- name: Ensure python-yaml present for config upgrade
action: "{{ ansible_pkg_mgr }} name=PyYAML state=present"
@@ -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_atomic | bool
- name: Restart node service
service: name="{{ openshift.common.service_type }}-node" state=restarted
--
cgit v1.2.3
From 2b4aad9db8118a67710ad6cb5bed70afff292e82 Mon Sep 17 00:00:00 2001
From: talset <florian.lambert@enovance.com>
Date: Thu, 25 Feb 2016 10:57:56 +0100
Subject: Change is_atomic to is_containerized
* Update playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
* Change is_atomic by is_containerized in order to take care about container openshift without atomic
---
playbooks/common/openshift-cluster/upgrades/v3_1_minor/upgrade.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'playbooks/common/openshift-cluster')
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 2f67a3bc2..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,11 +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_atomic | bool
+ 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
#
@@ -64,7 +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_atomic | bool
+ when: not openshift.common.is_containerized | bool
- name: Restart node service
service: name="{{ openshift.common.service_type }}-node" state=restarted
--
cgit v1.2.3