File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed
cookbooks/aws-parallelcluster-platform Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 3030default [ 'cluster' ] [ 'nvidia' ] [ 'nvlsm' ] [ 'enabled' ] = true
3131
3232# DCV
33- default [ 'cluster' ] [ 'dcv' ] [ 'skip_install ' ] = false
33+ default [ 'cluster' ] [ 'dcv' ] [ 'install_enabled ' ] = true
3434default [ 'cluster' ] [ 'dcv' ] [ 'authenticator' ] [ 'user' ] = "dcvextauth"
3535default [ 'cluster' ] [ 'dcv' ] [ 'authenticator' ] [ 'user_id' ] = node [ 'cluster' ] [ 'reserved_base_uid' ] + 3
3636default [ 'cluster' ] [ 'dcv' ] [ 'authenticator' ] [ 'group' ] = node [ 'cluster' ] [ 'dcv' ] [ 'authenticator' ] [ 'user' ]
Original file line number Diff line number Diff line change @@ -100,8 +100,8 @@ def optionally_disable_rnd
100100end
101101
102102action :setup do
103- if node [ 'cluster' ] [ 'dcv' ] [ 'skip_install ' ]
104- Chef ::Log . warn ( "Skipping DCV installation because node['cluster']['dcv']['skip_install '] is set to true " )
103+ unless node [ 'cluster' ] [ 'dcv' ] [ 'install_enabled ' ]
104+ Chef ::Log . warn ( "Skipping DCV installation because node['cluster']['dcv']['install_enabled '] is set to false " )
105105 return
106106 end
107107 return if dcv_installed?
Original file line number Diff line number Diff line change @@ -657,11 +657,11 @@ def self.nothing(chef_run)
657657 end
658658 end
659659
660- context "when skip_install is true " do
660+ context "when install_enabled is false " do
661661 cached ( :chef_run ) do
662662 runner = runner ( platform : platform , version : version , step_into : [ 'dcv' ] ) do |node |
663663 node_setup . call ( node )
664- node . override [ 'cluster' ] [ 'dcv' ] [ 'skip_install ' ] = true
664+ node . override [ 'cluster' ] [ 'dcv' ] [ 'install_enabled ' ] = false
665665 end
666666 stubs_for_resource ( 'dcv' ) do |res |
667667 allow ( res ) . to receive ( :dcv_sha256sum ) . and_return ( checksum )
@@ -682,7 +682,7 @@ def self.nothing(chef_run)
682682 ConvergeDcv . setup ( runner )
683683 end
684684
685- it 'skips dcv installation ' do
685+ it 'does not install dcv when install_enabled is false ' do
686686 is_expected . not_to create_if_missing_cookbook_file ( "#{ scripts_dir } /pcluster_dcv_connect.sh" )
687687 is_expected . not_to create_group ( authenticator_group )
688688 is_expected . not_to create_user ( authenticator_user )
You can’t perform that action at this time.
0 commit comments