Simplify slurm suspend/resume process and reduce some duplication.

env/jsiu/templates/slurm/slurm.conf.j2

@@ -50,10 +50,10 @@ FirstJobId=592574
 # Cloud configuration
 #
 PrivateData=cloud
-ResumeProgram=/opt/slurmscale/sbin/slurm_resume.sh
-SuspendProgram=/opt/slurmscale/sbin/slurm_suspend.sh
+ResumeProgram=/opt/slurmscale/sbin/slurm_resume
+SuspendProgram=/opt/slurmscale/sbin/slurm_suspend
 ResumeRate=0        # number of nodes per minute that can be created; 0 means no limit
-ResumeTimeout=1800  # max time in seconds between ResumeProgram running and when the node is ready for use
+ResumeTimeout=900   # max time in seconds between ResumeProgram running and when the node is ready for use
 SuspendRate=0       # number of nodes per minute that can be suspended/destroyed
 SuspendTime=90      # time in seconds before an idle node is suspended
 SuspendTimeout=60   # time between running SuspendProgram and the node being completely down

roles/slurmscale/files/ansible.cfg

@@ -5,5 +5,8 @@ private_key_file = slurm-kp.pem
 retry_files_enabled = false
 transport = ssh
 
+[inventory]
+enable_plugins = host_list, ini, openstack
+
 [ssh_connection]
 ssh_args = -o BatchMode=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no

roles/slurmscale/files/group_vars/all/cluster.yml

@@ -31,25 +31,25 @@ jetstream_nfs_filesystems:
     dir: scratch0
 
 directories:
-  - path: /galaxy-repl/test
-  - path: /galaxy-repl/main
+  #- path: /galaxy-repl/test
+  #- path: /galaxy-repl/main
   - path: /var/lib/slurm
     mode: "0755"
 
 # symlinks for deps must exist due to path issues
-links:
-  - path: /galaxy
-    src: /galaxy-repl
-    force: yes
-  - path: /galaxy-repl/test/deps
-    src: /cvmfs/test.galaxyproject.org/deps
-    force: yes
-  - path: /galaxy-repl/test/tool_data
-    src: /cvmfs/data.galaxyproject.org/byhand/location
-    force: yes
-  - path: /galaxy-repl/main/deps
-    src: /cvmfs/main.galaxyproject.org/deps
-    force: yes
-  - path: /galaxy-repl/main/tool_data
-    src: /cvmfs/data.galaxyproject.org/byhand/location
-    force: yes
+#links:
+#  - path: /galaxy
+#    src: /galaxy-repl
+#    force: yes
+#  - path: /galaxy-repl/test/deps
+#    src: /cvmfs/test.galaxyproject.org/deps
+#    force: yes
+#  - path: /galaxy-repl/test/tool_data
+#    src: /cvmfs/data.galaxyproject.org/byhand/location
+#    force: yes
+#  - path: /galaxy-repl/main/deps
+#    src: /cvmfs/main.galaxyproject.org/deps
+#    force: yes
+#  - path: /galaxy-repl/main/tool_data
+#    src: /cvmfs/data.galaxyproject.org/byhand/location
+#    force: yes

roles/slurmscale/files/group_vars/all/spawn.yml

@@ -5,4 +5,4 @@ key_name: slurm-kp
 nics: net-name=usegalaxy
 security_groups: default
 auto_ip: no
-
+flavor: m1.{{ inventory_hostname | regex_replace("^.*-([^\d]+).*", "\1") }}

roles/slurmscale/files/inventory/openstack.yml

@@ -0,0 +1,7 @@
+---
+
+plugin: openstack
+only_clouds:
+  - jetstream_iu
+private: yes
+expand_hostvars: no