Refactoring Munge setup

* Refactor process to setup munge key

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

Author: Rex

attributes/default.rb

@@ -108,8 +108,6 @@
 # Munge
 default['cfncluster']['munge']['munge_version'] = '0.5.14'
 default['cfncluster']['munge']['munge_url'] = "https://github.com/dun/munge/archive/munge-#{node['cfncluster']['munge']['munge_version']}.tar.gz"
-# Munge key
-default['cfncluster']['munge']['munge_key'] = 'YflQEFLjoxsmEK5vQyKklkLKJ#LkjLKDJF@*(#)ajLKQ@hLKN#()FSU(#@KLJH$@HKSASG)*DUJJDksdN'
 
 # Ganglia
 default['cfncluster']['ganglia_enabled'] = 'no'

libraries/helpers.rb

@@ -432,3 +432,46 @@ def overwrite_nfs_template?
     node['platform'] == 'centos' && node['platform_version'].to_i == 8
   ].any?
 end
+
+def enable_munge_service
+  service "munge" do
+    supports restart: true
+    action %i[enable start]
+  end
+end
+
+def setup_munge_head_node
+  # Generate munge key
+  bash 'generate_munge_key' do
+    user 'munge'
+    group 'munge'
+    cwd '/tmp'
+    code <<-HEAD_MUNGE_KEY
+      set -e
+      # Generates munge key in /etc/munge/munge.key
+      /usr/sbin/mungekey --verbose
+      # Enforce correct permission on the key
+      chmod 0600 /etc/munge/munge.key
+      # Copy key to shared dir
+      cp -p /etc/munge/munge.key /home/munge/.munge.key
+    HEAD_MUNGE_KEY
+  end
+
+  enable_munge_service()
+end
+
+def setup_munge_compute_node
+  # Get munge key
+  bash 'get_munge_key' do
+    user 'munge'
+    group 'munge'
+    cwd '/tmp'
+    code <<-COMPUTE_MUNGE_KEY
+      set -e
+      # Copy munge key from shared dir
+      cp -p /home/munge/.munge.key /etc/munge/munge.key
+    COMPUTE_MUNGE_KEY
+  end
+
+  enable_munge_service()
+end

recipes/compute_slurm_config.rb

@@ -15,6 +15,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
+setup_munge_compute_node()
+
 # Create directory configured as SlurmdSpoolDir
 directory '/var/spool/slurmd' do
   user 'slurm'

recipes/compute_torque_config.rb

@@ -15,6 +15,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
+setup_munge_compute_node()
+
 # pbs_mom config
 template '/var/spool/torque/mom_priv/config' do
   source 'torque.config.erb'

recipes/head_node_slurm_config.rb

@@ -15,6 +15,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
+setup_munge_head_node()
+
 # Export /opt/slurm
 nfs_export "/opt/slurm" do
   network node['cfncluster']['ec2-metadata']['vpc-ipv4-cidr-blocks']

recipes/head_node_torque_config.rb

@@ -15,6 +15,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
+setup_munge_head_node()
+
 # Modified torque.setup
 template 'torque.setup' do
   source 'torque.setup.erb'

recipes/munge_install.rb

@@ -67,10 +67,11 @@
 
 # Make sure the munge user exists
 user 'munge' do
-  manage_home false
+  manage_home true
   comment 'munge user'
+  home "/home/munge"
   system true
-  shell '/sbin/nologin'
+  shell '/usr/sbin/nologin'
 end
 
 # Create required directories for munge

recipes/slurm_config.rb

@@ -18,19 +18,6 @@
 include_recipe 'aws-parallelcluster::base_config'
 include_recipe 'aws-parallelcluster::slurm_install'
 
-# Create the munge key from template
-template "/etc/munge/munge.key" do
-  source "munge.key.erb"
-  owner "munge"
-  mode "0600"
-end
-
-# Enable munge service
-service "munge" do
-  supports restart: true
-  action %i[enable start]
-end
-
 cookbook_file '/etc/init.d/slurm' do
   source 'slurm-init'
   owner 'root'

recipes/torque_config.rb

@@ -54,19 +54,6 @@
   action %i[enable start]
 end
 
-# Create the munge key from template
-template "/etc/munge/munge.key" do
-  source "munge.key.erb"
-  owner "munge"
-  mode "0600"
-end
-
-# Enable munge service
-service "munge" do
-  supports restart: true
-  action %i[enable start]
-end
-
 cookbook_file "/etc/profile.d/torque.sh" do
   source 'torque.sh'
   owner 'root'