From 6b4ecfac78d9a03139d903c867cc20ed1f69b182 Mon Sep 17 00:00:00 2001 From: Franck Grosjean Date: Fri, 28 Sep 2018 15:18:12 +0200 Subject: [PATCH 1/4] re-apply tuned profile dunring upgrade --- .../openshift-cluster/upgrades/post_control_plane.yml | 7 +++++++ .../common/openshift-cluster/upgrades/upgrade_nodes.yml | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml index 109d767fdee..b00e33292d5 100644 --- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml @@ -70,4 +70,11 @@ when: - __shared_resource_viewer_protected | default(false) +# Tuned profile are removed when removing tuned-profiles-atomic-openshift-node rpm +# Need to be re apply +- name: Re apply tuned profiles + hosts: oo_first_master + roles: + - tuned + - import_playbook: upgrade_components.yml diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml index 70666e9eebf..277cab2019f 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml @@ -94,3 +94,12 @@ name: openshift_excluder vars: r_openshift_excluder_action: enable + +# Tuned profile are removed when removing tuned-profiles-atomic-openshift-node rpm +# Need to be re apply +- name: Re-enable tuned profiles + hosts: oo_nodes_to_upgrade:!oo_masters_to_config + tasks: + - import_role: + name: tuned + From 40a10391405e78c6708a04277ab6caa4eb5b51f7 Mon Sep 17 00:00:00 2001 From: Franck Grosjean Date: Wed, 3 Oct 2018 10:39:28 +0200 Subject: [PATCH 2/4] move tuned role from a separated play to a post task in upgrade_nodes.yml --- .../openshift-cluster/upgrades/upgrade_nodes.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml index 277cab2019f..f80e01d192d 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml @@ -86,6 +86,11 @@ when: > ('glusterfs' in groups and inventory_hostname in groups['glusterfs']) or ('glusterfs_registry' in groups and inventory_hostname in groups['glusterfs_registry']) + + # Tuned profile are removed when removing tuned-profiles-atomic-openshift-node rpm + # Need to be re apply + - import_role: + name: tuned - name: Re-enable excluders hosts: oo_nodes_to_upgrade:!oo_masters_to_config @@ -95,11 +100,3 @@ vars: r_openshift_excluder_action: enable -# Tuned profile are removed when removing tuned-profiles-atomic-openshift-node rpm -# Need to be re apply -- name: Re-enable tuned profiles - hosts: oo_nodes_to_upgrade:!oo_masters_to_config - tasks: - - import_role: - name: tuned - From e1376e8774bff262205668ffa38d9ceaedd60a38 Mon Sep 17 00:00:00 2001 From: Franck Grosjean Date: Wed, 3 Oct 2018 10:46:48 +0200 Subject: [PATCH 3/4] move tuned role from post_control_plane.yml to an additional task in upgrade.yml --- .../openshift-cluster/upgrades/post_control_plane.yml | 7 ------- playbooks/openshift-master/private/upgrade.yml | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml index b00e33292d5..109d767fdee 100644 --- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml @@ -70,11 +70,4 @@ when: - __shared_resource_viewer_protected | default(false) -# Tuned profile are removed when removing tuned-profiles-atomic-openshift-node rpm -# Need to be re apply -- name: Re apply tuned profiles - hosts: oo_first_master - roles: - - tuned - - import_playbook: upgrade_components.yml diff --git a/playbooks/openshift-master/private/upgrade.yml b/playbooks/openshift-master/private/upgrade.yml index ce4eb21d908..c23c05098bd 100644 --- a/playbooks/openshift-master/private/upgrade.yml +++ b/playbooks/openshift-master/private/upgrade.yml @@ -345,3 +345,5 @@ vars: openshift_master_host: "{{ groups.oo_first_master.0 }}" openshift_manage_node_is_master: true + - import_role: + name: tuned From ae57c0c34a6ac5122c986eb0b60a922fc97a1290 Mon Sep 17 00:00:00 2001 From: Franck Grosjean Date: Tue, 9 Oct 2018 09:34:08 +0200 Subject: [PATCH 4/4] fix trailing spaces and blank lines --- playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml index f80e01d192d..d443158869c 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml @@ -86,7 +86,7 @@ when: > ('glusterfs' in groups and inventory_hostname in groups['glusterfs']) or ('glusterfs_registry' in groups and inventory_hostname in groups['glusterfs_registry']) - + # Tuned profile are removed when removing tuned-profiles-atomic-openshift-node rpm # Need to be re apply - import_role: @@ -99,4 +99,3 @@ name: openshift_excluder vars: r_openshift_excluder_action: enable -