Make disable_service and is_service_disabled more general setting platform_families default to the current value

francesco-giordano · francesco-giordano · commit 0c52c5be514d · 2022-07-20T18:56:34.000+02:00
Signed-off-by: Francesco Giordano &lt;giordafr@amazon.it&gt;
diff --git a/cookbooks/aws-parallelcluster-install/libraries/helpers.rb b/cookbooks/aws-parallelcluster-install/libraries/helpers.rb
@@ -15,7 +15,7 @@
 #
 # Disable service
 #
-def disable_service(service, platform_families = %i(rhel amazon debian), operations = :disable)
+def disable_service(service, platform_families = node['platform_family'], operations = :disable)
   if platform_family?(platform_families)
     service service do
       action operations
diff --git a/cookbooks/aws-parallelcluster-test/libraries/helpers.rb b/cookbooks/aws-parallelcluster-test/libraries/helpers.rb
@@ -228,7 +228,7 @@ def check_ssh_target_checker_vpc_cidr_list(ssh_target_checker_script, expected_c
 #
 # Check if a service is disabled
 #
-def is_service_disabled(service, platform_families = %i(rhel amazon debian))
+def is_service_disabled(service, platform_families = node['platform_family'])
   if platform_family?(platform_families)
     execute "check #{service} service is disabled" do
       command "systemctl is-enabled #{service} && exit 1 || exit 0"

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`#`
`16`	`16`	`# Disable service`
`17`	`17`	`#`
`18`		`-def disable_service(service, platform_families = %i(rhel amazon debian), operations = :disable)`
	`18`	`+def disable_service(service, platform_families = node['platform_family'], operations = :disable)`
`19`	`19`	`if platform_family?(platform_families)`
`20`	`20`	`service service do`
`21`	`21`	`action operations`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ def check_ssh_target_checker_vpc_cidr_list(ssh_target_checker_script, expected_c`
`228`	`228`	`#`
`229`	`229`	`# Check if a service is disabled`
`230`	`230`	`#`
`231`		`-def is_service_disabled(service, platform_families = %i(rhel amazon debian))`
	`231`	`+def is_service_disabled(service, platform_families = node['platform_family'])`
`232`	`232`	`if platform_family?(platform_families)`
`233`	`233`	`execute "check #{service} service is disabled" do`
`234`	`234`	`command "systemctl is-enabled #{service} && exit 1 \|\| exit 0"`