From 7d29db940dd6ad007d674a8200ffd42372b3fec1 Mon Sep 17 00:00:00 2001 From: pneerincx Date: Tue, 26 Jul 2022 14:25:14 +0200 Subject: [PATCH 1/4] Added swap role to repo inventory group. --- single_group_playbooks/repo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/single_group_playbooks/repo.yml b/single_group_playbooks/repo.yml index 472888654..cc8a9ad96 100644 --- a/single_group_playbooks/repo.yml +++ b/single_group_playbooks/repo.yml @@ -7,6 +7,7 @@ - admin_users - ssh_host_signer - ssh_known_hosts + - swap - {role: geerlingguy.repo-epel, become: true} - logrotate - logins From 1f61c15654df1ea3e538d39ed220419faae7e93b Mon Sep 17 00:00:00 2001 From: pneerincx Date: Tue, 26 Jul 2022 14:26:05 +0200 Subject: [PATCH 2/4] Adjusted swap_file_size for wh-repo and nb-repo as the default is too large. --- static_inventories/nibbler_cluster.yml | 1 + static_inventories/wingedhelix_cluster.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/static_inventories/nibbler_cluster.yml b/static_inventories/nibbler_cluster.yml index 0833e323c..194c4acae 100644 --- a/static_inventories/nibbler_cluster.yml +++ b/static_inventories/nibbler_cluster.yml @@ -12,6 +12,7 @@ all: hosts: nb-repo: cloud_flavor: m1.small + swap_file_size: 2 data_transfer: hosts: nb-transfer: diff --git a/static_inventories/wingedhelix_cluster.yml b/static_inventories/wingedhelix_cluster.yml index f377e54bf..2e50ab56e 100644 --- a/static_inventories/wingedhelix_cluster.yml +++ b/static_inventories/wingedhelix_cluster.yml @@ -13,6 +13,7 @@ all: hosts: wh-repo: cloud_flavor: m1.small + swap_file_size: 2 docs: hosts: docs_on_merlin: From 73d8c05c19c7b2b5ea045dd8a8722ae4d50a378c Mon Sep 17 00:00:00 2001 From: pneerincx Date: Tue, 26 Jul 2022 14:39:35 +0200 Subject: [PATCH 3/4] Added flush_handlers to manage swap at the end of the "swap" role and potentially before any follow up roles. --- roles/swap/tasks/disable_swap.yml | 3 +++ roles/swap/tasks/enable_swap.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/roles/swap/tasks/disable_swap.yml b/roles/swap/tasks/disable_swap.yml index 3bcc45db7..7b47b7e60 100644 --- a/roles/swap/tasks/disable_swap.yml +++ b/roles/swap/tasks/disable_swap.yml @@ -24,4 +24,7 @@ path: "{{ swap_file_path }}" state: absent become: true + +- name: Flush handlers to disable swap. + ansible.builtin.meta: flush_handlers ... diff --git a/roles/swap/tasks/enable_swap.yml b/roles/swap/tasks/enable_swap.yml index 0419bc0a4..f9700f7e1 100644 --- a/roles/swap/tasks/enable_swap.yml +++ b/roles/swap/tasks/enable_swap.yml @@ -45,4 +45,7 @@ name: vm.swappiness value: "{{ swap_swappiness | int }}" become: true + +- name: Flush handlers to enable swap. + ansible.builtin.meta: flush_handlers ... From 04d3b11b026b6b57e8882ee945f53be5d52799b1 Mon Sep 17 00:00:00 2001 From: pneerincx Date: Tue, 26 Jul 2022 14:52:22 +0200 Subject: [PATCH 4/4] Added repo inventory group to single_role_playbooks/swap.yml. --- single_role_playbooks/swap.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/single_role_playbooks/swap.yml b/single_role_playbooks/swap.yml index 499eb014e..f809c298d 100644 --- a/single_role_playbooks/swap.yml +++ b/single_role_playbooks/swap.yml @@ -1,4 +1,6 @@ --- -- hosts: cluster +- hosts: + - repo + - cluster roles: - swap