From 38bf27713dc1b694dcbd4f784a3fcc10e4372a31 Mon Sep 17 00:00:00 2001 From: Vlad Zolotarov Date: Fri, 16 Feb 2024 21:11:37 -0500 Subject: [PATCH 1/2] scylla-node: fix scylla_setup call Add missing --no-cpuscaling-setup and --no-fstrim-setup (we explicitly setup these later in the play) and make sure to always call `scylla_setup` - with the parameters we call it it should be safe to call it even when scylla server is already running. We also don't need to give '--nic {{ scylla_nic }} --setup-nic-and-disks' parameters because they are canceled by --no-sysconfig-setup at the end of the command line and because we are going to call scylla_sysconfig_setup later in the play explicitly. Fixes #339 Signed-off-by: Vlad Zolotarov --- ansible-scylla-node/tasks/common.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible-scylla-node/tasks/common.yml b/ansible-scylla-node/tasks/common.yml index 29706a9e..e2586bf2 100644 --- a/ansible-scylla-node/tasks/common.yml +++ b/ansible-scylla-node/tasks/common.yml @@ -147,9 +147,8 @@ - name: configure Scylla shell: | - scylla_setup --no-raid-setup --nic {{ scylla_nic }} --setup-nic-and-disks --no-ec2-check --no-kernel-check --no-ntp-setup --no-io-setup --no-node-exporter --no-coredump-setup --no-sysconfig-setup --no-swap-setup + scylla_setup --no-raid-setup --no-ec2-check --no-kernel-check --no-ntp-setup --no-io-setup --no-node-exporter --no-coredump-setup --no-sysconfig-setup --no-swap-setup --no-cpuscaling-setup --no-fstrim-setup become: true - when: ansible_facts.services["scylla-server.service"] is defined and ansible_facts.services["scylla-server.service"]["state"] != "running" - name: configure scylla.yaml template: From 4b6afd7bfdbecc9ef70d2d4086982822acc5fccd Mon Sep 17 00:00:00 2001 From: Vlad Zolotarov Date: Mon, 19 Feb 2024 14:46:02 -0500 Subject: [PATCH 2/2] scylla-node: scylla_setup: set --no-memory-setup Signed-off-by: Vlad Zolotarov --- ansible-scylla-node/tasks/common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-scylla-node/tasks/common.yml b/ansible-scylla-node/tasks/common.yml index e2586bf2..51305eb5 100644 --- a/ansible-scylla-node/tasks/common.yml +++ b/ansible-scylla-node/tasks/common.yml @@ -147,7 +147,7 @@ - name: configure Scylla shell: | - scylla_setup --no-raid-setup --no-ec2-check --no-kernel-check --no-ntp-setup --no-io-setup --no-node-exporter --no-coredump-setup --no-sysconfig-setup --no-swap-setup --no-cpuscaling-setup --no-fstrim-setup + scylla_setup --no-raid-setup --no-ec2-check --no-kernel-check --no-ntp-setup --no-io-setup --no-node-exporter --no-coredump-setup --no-sysconfig-setup --no-swap-setup --no-cpuscaling-setup --no-fstrim-setup --no-memory-setup become: true - name: configure scylla.yaml