Merge pull request 'update slurm module and fix the bug for jwt_key' (#1404) from sluem_web into master

Reviewed-on: https://gitea.obmondo.com/EnableIT/LinuxAid/pulls/1404

Author: Aman Shah

modules/enableit/eit_types/types/slurm/policy.pp

@@ -1,12 +1,12 @@
 type Eit_types::Slurm::Policy = Struct[{
-  'roles' => Struct[{
-    'user'  => Variant[String, Array[String]],
-    'admin' => Variant[String, Array[String]],
-  }],
-  'user' => Struct[{
+  'roles' => Optional[Struct[{
+    'user'  => Optional[Variant[String, Array[String]]],
+    'admin' => Optional[Variant[String, Array[String]]],
+  }]],
+  'user' => Optional[Struct[{
     'actions' => Variant[String, Array[String]],
-  }],
-  'admin' => Struct[{
+  }]],
+  'admin' => Optional[Struct[{
     'actions' => Variant[String, Array[String]],
-  }],
+  }]],
 }]

modules/enableit/profile/manifests/computing/slurm.pp

@@ -157,18 +157,6 @@
     }
   }
 
-  package { ['libjwt', 'libjwt-devel']:
-    ensure => ensure_present($_jwt_key),
-    noop   => $noop_value,
-  }
-
-  file { '/var/spool/slurm/jwt_hs256.key':
-    ensure  => ensure_file($_jwt_key),
-    source  => eit_files::to_file($jwt_key)['source'],
-    noop    => $noop_value,
-    require => Package['libjwt', 'libjwt-devel'],
-  }
-
   if !$enable {
     package::remove( ['slurm', 'slurm-slurmdbd', 'slurm-slurmctld', 'slurm-slurmd', 'munge'])
   }

modules/enableit/profile/manifests/computing/slurm/slurm_web.pp

@@ -92,11 +92,12 @@
 #         actions: 'view-partitions,view-qos,view-accounts,view-reservations'
 #
 class profile::computing::slurm::slurm_web (
-  Boolean                   $enable     = $::role::computing::slurm::slurm_web,
-  Boolean                   $noop_value = $::role::computing::slurm::noop_value,
-  Eit_types::Slurm::Agent   $agent      = $::role::computing::slurm::slurm_agent,
-  Eit_types::Slurm::Gateway $gateway    = $::role::computing::slurm::slurm_gateway,
-  Eit_types::Slurm::Policy  $policy     = $::role::computing::slurm::slurm_policy,
+  Boolean                     $enable     = $::role::computing::slurm::slurm_web,
+  Boolean                     $noop_value = $::role::computing::slurm::noop_value,
+  Optional[Eit_Files::Source] $jwt_key    = $::role::computing::slurm::jwt_key,
+  Eit_types::Slurm::Agent     $agent      = $::role::computing::slurm::slurm_agent,
+  Eit_types::Slurm::Gateway   $gateway    = $::role::computing::slurm::slurm_gateway,
+  Eit_types::Slurm::Policy    $policy     = $::role::computing::slurm::slurm_policy,
 ) {
 
   # -------------------------------------------------------
@@ -123,6 +124,12 @@
     noop    => $noop_value,
   }
 
+  package { ['libjwt', 'libjwt-devel']:
+    ensure => ensure_present($enable),
+    noop   => $noop_value,
+  }
+
+
   # -------------------------------------------------------
   # Systemd override for slurmrestd
   # -------------------------------------------------------
@@ -175,6 +182,13 @@
     noop   => $noop_value,
   }
 
+  file { '/var/spool/slurm/jwt_hs256.key':
+    ensure  => ensure_file($enable),
+    source  => eit_files::to_file($jwt_key)['source'],
+    noop    => $noop_value,
+    require => Package['libjwt', 'libjwt-devel'],
+  }
+
   file { '/etc/slurm-web/agent.ini':
     ensure  => ensure_file($enable),
     noop    => $noop_value,

modules/enableit/profile/templates/computing/slurm/slurmweb/policy.ini.epp

@@ -7,11 +7,19 @@
 # THIS FILE IS MANAGED BY PUPPET.
 
 [roles]
+<% if $policy['roles']['user'] { -%>
 user=<%= Array($policy['roles']['user']).join(',') %>
+<% } -%>
+<% if $policy['roles']['admin'] { -%>
 admin=<%= Array($policy['roles']['admin']).join(',') %>
+<% } -%>
 
+<% if $policy['roles']['user'] { -%>
 [user]
 actions=<%= Array($policy['user']['actions']).join(',') %>
+<% } -%>
 
+<% if $policy['roles']['admin'] { -%>
 [admin]
 actions=<%= Array($policy['admin']['actions']).join(',') %>
+<% } -%>

modules/enableit/role/manifests/computing/slurm.pp

@@ -80,6 +80,7 @@
   contain 'profile::computing::slurm::slurm_web'
 
   if $slurm_web {
+    contain profile::computing::slurm::slurm_web
     contain role::web::haproxy
   }
 }