Use static IP to populate slurmdbd's DbdAddr parameter

Export the IP into the instance dna.json. Add minor comments to the code. Signed-off-by: Jacopo De Amicis <[email protected]>
jdeamicis · Jan 29, 2024 · 4fc7c3d · 4fc7c3d
1 parent ea8bc17
commit 4fc7c3d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/cookbooks/aws-parallelcluster-entrypoints/recipes/external_slurmdbd_config.rb b/cookbooks/aws-parallelcluster-entrypoints/recipes/external_slurmdbd_config.rb
@@ -49,8 +49,6 @@
 
 include_recipe 'aws-parallelcluster-slurm::config_head_node_directories'
 
-# TODO: configuration of munge systemd service;
-
 # TODO: move this template to a separate recipe
 # TODO: add a logic in update_munge_key.sh.erb to skip sharing munge key to shared dir
 template "#{node['cluster']['scripts_dir']}/slurm/update_munge_key.sh" do

diff --git a/cookbooks/aws-parallelcluster-slurm/recipes/config/config_slurm_accounting.rb b/cookbooks/aws-parallelcluster-slurm/recipes/config/config_slurm_accounting.rb
@@ -32,6 +32,7 @@
   action :create_if_missing
   variables(
     dbd_host: "localhost",
+    dbd_addr: node['slurmdbd_ip'],
     storage_host: node['dbms_uri'],
     # TODO: expose additional CFN Parameter in template
     storage_port: 3306,
@@ -74,6 +75,8 @@
 # After starting slurmdbd the database may not be fully responsive yet and
 # its bootstrapping may fail. We need to wait for sacctmgr to successfully
 # query the database before proceeding.
+# In case of an external slurmdbd the Slurm commands do not work, so this
+# check cannot be executed.
 execute "wait for slurm database" do
   command "#{node['cluster']['slurm']['install_dir']}/bin/sacctmgr show clusters -Pn"
   retries node['cluster']['slurmdbd_response_retries']

diff --git a/...lcluster-slurm/templates/default/slurm/external_slurmdbd/slurm_external_slurmdbd.conf.erb b/...lcluster-slurm/templates/default/slurm/external_slurmdbd/slurm_external_slurmdbd.conf.erb
@@ -2,6 +2,7 @@
 # Do not modify.
 # Please add user-specific slurmdbd configuration options in slurmdbd.conf
 DbdHost=<%= @dbd_host %>
+DbdAddr=<%= @dbd_addr %>
 StorageHost=<%= @storage_host %>
 StoragePort=<%= @storage_port %>
 StorageLoc=<%= @storage_loc %>