[LoginNodes] Move login node config files out of shared directory

This commit allows each login node to use its own config files. This is necessary after multiple pools of login nodes are supported; because different pools can have different configs (e.g. Gracetime period)

Signed-off-by: Hanwen <[email protected]>

Author: hanwen-cluster

cookbooks/aws-parallelcluster-platform/recipes/config/loginmgtd.rb

@@ -18,26 +18,26 @@
 load_cluster_config(node['cluster']['login_cluster_config_path'])
 
 # Create the configuration file for loginmgtd
-template "#{node['cluster']['shared_dir_login_nodes']}/loginmgtd_config.json" do
+template "#{node['cluster']['etc_dir']}/loginmgtd_config.json" do
   source 'loginmgtd/loginmgtd_config.json.erb'
   owner node['cluster']['cluster_admin_user']
   group node['cluster']['cluster_admin_user']
   mode '0644'
   variables(
-    gracetime_period: lazy { node['cluster']['config'].dig(:LoginNodes, :Pools, 0, :GracetimePeriod) }
+    gracetime_period: lazy { get_login_node_pool_config(node['cluster']['config'], node['cluster']['pool_name'])['GracetimePeriod'] }
   )
 end
 
 # Create the termination hook for loginmgtd
-template "#{node['cluster']['shared_dir_login_nodes']}/loginmgtd_on_termination.sh" do
+template "#{node['cluster']['etc_dir']}/loginmgtd_on_termination.sh" do
   source 'loginmgtd/loginmgtd_on_termination.sh.erb'
   owner node['cluster']['cluster_admin_user']
   group node['cluster']['cluster_admin_user']
   mode '0744'
 end
 
 # Create the script to run loginmgtd
-template "#{node['cluster']['shared_dir_login_nodes']}/loginmgtd.sh" do
+template "#{node['cluster']['etc_dir']}/loginmgtd.sh" do
   source 'loginmgtd/loginmgtd.sh.erb'
   owner node['cluster']['cluster_admin_user']
   group node['cluster']['cluster_admin_user']

cookbooks/aws-parallelcluster-platform/spec/unit/recipes/loginmgtd_spec.rb

@@ -8,7 +8,7 @@
       end
 
       it 'creates the loginmgtd configuration with the correct attributes' do
-        is_expected.to create_template('/opt/parallelcluster/shared_login_nodes/loginmgtd_config.json').with(
+        is_expected.to create_template('/etc/parallelcluster/loginmgtd_config.json').with(
           source: 'loginmgtd/loginmgtd_config.json.erb',
           owner: 'pcluster-admin',
           group: 'pcluster-admin',
@@ -17,7 +17,7 @@
       end
 
       it 'creates the loginmgtd script with the correct attributes' do
-        is_expected.to create_template('/opt/parallelcluster/shared_login_nodes/loginmgtd.sh').with(
+        is_expected.to create_template('/etc/parallelcluster/loginmgtd.sh').with(
           source: 'loginmgtd/loginmgtd.sh.erb',
           owner: 'pcluster-admin',
           group: 'pcluster-admin',
@@ -26,7 +26,7 @@
       end
 
       it 'creates the loginmgtd termination hook script with the correct attributes' do
-        is_expected.to create_template('/opt/parallelcluster/shared_login_nodes/loginmgtd_on_termination.sh').with(
+        is_expected.to create_template('/etc/parallelcluster/loginmgtd_on_termination.sh').with(
           source: 'loginmgtd/loginmgtd_on_termination.sh.erb',
           owner: 'pcluster-admin',
           group: 'pcluster-admin',

cookbooks/aws-parallelcluster-platform/templates/loginmgtd/99-parallelcluster-loginmgtd.erb

@@ -1,3 +1,3 @@
-Cmnd_Alias LOGINMGTD_HOOKS_COMMANDS = <%= node['cluster']['shared_dir_login_nodes'] %>/loginmgtd_on_termination.sh
+Cmnd_Alias LOGINMGTD_HOOKS_COMMANDS = <%= node['cluster']['etc_dir'] %>/loginmgtd_on_termination.sh
 
 <%= node['cluster']['cluster_admin_user'] %> ALL = (root) NOPASSWD: LOGINMGTD_HOOKS_COMMANDS

cookbooks/aws-parallelcluster-platform/templates/loginmgtd/loginmgtd.sh.erb

@@ -11,7 +11,7 @@ set -ex
 # This script must be executed as <%= node['cluster']['cluster_admin_user'] %> because
 # because only this user has sudoers privileges to execute the termination hook.
 
-CONFIG_PATH="<%= node['cluster']['shared_dir_login_nodes'] %>/loginmgtd_config.json"
+CONFIG_PATH="<%= node['cluster']['etc_dir'] %>/loginmgtd_config.json"
 CONFIG_JSON=$(cat $CONFIG_PATH)
 TERMINATION_SCRIPT_PATH=$(echo $CONFIG_JSON | jq -r .termination_script_path)
 TERMINATION_MESSAGE=$(echo $CONFIG_JSON | jq -r .termination_message)

cookbooks/aws-parallelcluster-platform/templates/loginmgtd/loginmgtd_config.json.erb

@@ -1,5 +1,5 @@
 {
-  "termination_script_path": "<%= node['cluster']['shared_dir_login_nodes'] %>/loginmgtd_on_termination.sh",
+  "termination_script_path": "<%= node['cluster']['etc_dir'] %>/loginmgtd_on_termination.sh",
   "termination_message": "The system will be terminated within <%= @gracetime_period %> minutes.",
   "gracetime_period": "<%= @gracetime_period %>"
 }

cookbooks/aws-parallelcluster-platform/templates/supervisord/parallelcluster_supervisord.conf.erb

@@ -60,7 +60,7 @@ stdout_logfile_maxbytes = 0
 <%# LoginNode -%>
 <% when 'LoginNode' -%>
 [program:loginmgtd]
-command = <%= node['cluster']['shared_dir_login_nodes'] %>/loginmgtd.sh
+command = <%= node['cluster']['etc_dir'] %>/loginmgtd.sh
 user = <%= node['cluster']['cluster_admin_user'] %>
 environment = HOME="/home/<%= node['cluster']['cluster_admin_user'] %>",USER="<%= node['cluster']['cluster_admin_user'] %>"
 autorestart = unexpected

cookbooks/aws-parallelcluster-slurm/libraries/helpers.rb

@@ -217,3 +217,7 @@ def check_for_protected_mode(fleet_status_command) # rubocop:disable Lint/Nested
     end
   end
 end
+
+def get_login_node_pool_config(config, pool_name)
+  config['LoginNodes']['Pools'].select { |pool| pool['Name'] == pool_name }.first
+end