Skip to content

Commit 20d803f

Browse files
Consider string "true" as turning on Lustre, Nvidia installation
Signed-off-by: Hanwen <[email protected]>
1 parent 7991177 commit 20d803f

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

cookbooks/aws-parallelcluster-environment/libraries/fsx.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ def aws_domain_for_fsx(region)
1010
end
1111

1212
def lustre_enabled?
13-
['yes', true].include?(node['cluster']['lustre']['enabled'])
13+
['yes', true, 'true'].include?(node['cluster']['lustre']['enabled'])
1414
end

cookbooks/aws-parallelcluster-platform/libraries/nvidia.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
def nvidia_enabled?
2-
['yes', true].include?(node['cluster']['nvidia']['enabled'])
2+
['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled'])
33
end
44

55
#

cookbooks/aws-parallelcluster-platform/resources/fabric_manager/partial/_fabric_manager_common.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def _fabric_manager_enabled
4545
end
4646

4747
def _nvidia_enabled
48-
nvidia_enabled.nil? ? ['yes', true].include?(node['cluster']['nvidia']['enabled']) : nvidia_enabled
48+
nvidia_enabled.nil? ? ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) : nvidia_enabled
4949
end
5050

5151
def _nvidia_driver_version

cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/partial/_nvidia_dcgm_common.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
end
2525

2626
def _nvidia_enabled
27-
nvidia_enabled.nil? ? ['yes', true].include?(node['cluster']['nvidia']['enabled']) : nvidia_enabled
27+
nvidia_enabled.nil? ? ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) : nvidia_enabled
2828
end
2929

3030
def package_version

cookbooks/aws-parallelcluster-platform/test/controls/enroot_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# See the License for the specific language governing permissions and limitations under the License.
1111

1212
control 'tag:install_expected_version_of_enroot_installed' do
13-
only_if { !os_properties.on_docker? && ['yes', true].include?(node['cluster']['nvidia']['enabled']) }
13+
only_if { !os_properties.on_docker? && ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) }
1414

1515
expected_enroot_version = node['cluster']['enroot']['version']
1616

@@ -31,15 +31,15 @@
3131
end
3232

3333
control 'tag:config_enroot_enabled_on_graphic_instances' do
34-
only_if { !os_properties.on_docker? && ['yes', true].include?(node['cluster']['nvidia']['enabled']) }
34+
only_if { !os_properties.on_docker? && ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) }
3535
describe 'enroot service should be enabled' do
3636
subject { command("enroot version") }
3737
its('exit_status') { should cmp == 0 }
3838
end
3939
end
4040

4141
control 'tag:config_enroot_disabled_on_non_graphic_instances' do
42-
only_if { !os_properties.on_docker? && !['yes', true].include?(node['cluster']['nvidia']['enabled']) }
42+
only_if { !os_properties.on_docker? && !['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) }
4343

4444
describe 'enroot service should be disabled' do
4545
subject { command("enroot version") }

cookbooks/aws-parallelcluster-platform/test/controls/nvidia_dcgm_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
control 'tag:install_nvidia_dcgm_installed' do
1313
only_if do
14-
['yes', true].include?(node['cluster']['nvidia']['enabled']) && !instance.custom_ami? &&
14+
['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) && !instance.custom_ami? &&
1515
(!os_properties.arm? || !(os_properties.alinux2? || os_properties.centos?))
1616
end
1717

cookbooks/aws-parallelcluster-platform/test/controls/nvidia_fabric_manager_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# See the License for the specific language governing permissions and limitations under the License.
1111

1212
control 'tag:install_expected_versions_of_nvidia_fabric_manager_installed' do
13-
only_if { !os_properties.arm? && ['yes', true].include?(node['cluster']['nvidia']['enabled']) }
13+
only_if { !os_properties.arm? && ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) }
1414

1515
describe package(node['cluster']['nvidia']['fabricmanager']['package']) do
1616
it { should be_installed }

cookbooks/aws-parallelcluster-slurm/test/controls/pyxis_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# See the License for the specific language governing permissions and limitations under the License.
1111

1212
control 'tag:install_pyxis_installed' do
13-
only_if { ['yes', true].include?(node['cluster']['nvidia']['enabled']) }
13+
only_if { ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) }
1414

1515
title 'Checks Pyxis has been installed'
1616

0 commit comments

Comments
 (0)