Share munge key from dir owned by root, under the default user home folder

Share munge key from dir owned by root from head node, than setup it in compute node
This because `munge` user can be different between head and compute node (e.g. during baking at runtime), hence the shared home munge dir can have different permission.

Signed-off-by: Luca Carrogu <[email protected]>
(cherry picked from commit dd55258)
Signed-off-by: Luca Carrogu <[email protected]>

Author: lukeseawalker

libraries/helpers.rb

@@ -446,30 +446,46 @@ def setup_munge_head_node
     user 'munge'
     group 'munge'
     cwd '/tmp'
-    code <<-HEAD_MUNGE_KEY
+    code <<-HEAD_CREATE_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
+    HEAD_CREATE_MUNGE_KEY
   end
 
   enable_munge_service()
+  share_munge_head_node()
+end
+
+def share_munge_head_node
+  # Share munge key
+  bash 'share_munge_key' do
+    user 'root'
+    group 'root'
+    code <<-HEAD_SHARE_MUNGE_KEY
+      set -e
+      mkdir /home/#{node['cfncluster']['cfn_cluster_user']}/.munge
+      # Copy key to shared dir
+      cp /etc/munge/munge.key /home/#{node['cfncluster']['cfn_cluster_user']}/.munge/.munge.key
+    HEAD_SHARE_MUNGE_KEY
+  end
 end
 
 def setup_munge_compute_node
   # Get munge key
   bash 'get_munge_key' do
-    user 'munge'
-    group 'munge'
-    cwd '/tmp'
+    user 'root'
+    group 'root'
     code <<-COMPUTE_MUNGE_KEY
       set -e
       # Copy munge key from shared dir
-      cp -p /home/munge/.munge.key /etc/munge/munge.key
+      cp /home/#{node['cfncluster']['cfn_cluster_user']}/.munge/.munge.key /etc/munge/munge.key
+      # Set ownership on the key
+      chown munge:munge /etc/munge/munge.key      
+      # Enforce correct permission on the key
+      chmod 0600 /etc/munge/munge.key
     COMPUTE_MUNGE_KEY
   end
 

recipes/munge_install.rb

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