Merge pull request #259 from diedpigs/feat-global-partition

Feat global partition

Author: rtripath89

group_vars/all

@@ -24,6 +24,9 @@
   cluster_host: "login001"
   slurm_bin_path: "/cm/shared/apps/slurm/current/bin"
   slurm_conf_path: "/cm/shared/apps/slurm/var/etc/slurm/slurm.conf"
+  slurm_partitions:
+    - { name: "defq", hours: 1, max_nodes: 0, priority: 2 }
+    - { name: "low", hours: 1, max_nodes: 0, priority: 2 }
 #  gres_types: "gpu"
 
 # sacct user list

roles/ood/templates/bc_desktop/submit.yml.erb roles/ood/files/bc_desktop/submit.yml.erb

@@ -52,7 +52,7 @@
 
 - name: Add cluster configuration files
   template:
-    src: cluster.yml
+    src: cluster.yml.j2
     dest: /etc/ood/config/clusters.d/{{ cluster_name }}.yml
 
 - name: Create interactive desktop settings directory
@@ -62,7 +62,7 @@
 
 - name: Add interactive desktop settings
   template:
-    src: bc_desktop/cluster.yml
+    src: bc_desktop/cluster.yml.j2
     dest: /etc/ood/config/apps/bc_desktop/{{ cluster_name }}.yml
 
 - name: Create interactive desktop job submit script directory
@@ -71,7 +71,7 @@
     state: directory
 
 - name: Add interactive desktop job submit script
-  template:
+  copy:
     src: bc_desktop/submit.yml.erb
     dest: /etc/ood/config/apps/bc_desktop/submit/submit.yml.erb
 

roles/ood/tasks/main.yaml

@@ -22,4 +22,8 @@ v2:
         export WEBSOCKIFY_CMD="/bin/websockify"
         %s
       set_host: "host=$(hostname -s)"
-
+  custom:
+    partitions:
+{% for p in slurm_partitions %}
+      - "{{ p.name }}"
+{% endfor %}

roles/ood/templates/bc_desktop/cluster.yml roles/ood/templates/bc_desktop/cluster.yml.j2

@@ -1,8 +1,8 @@
 ---
 - name: Put custom cluster.yml in place
   template:
-    src: cluster.yml
-    dest: /etc/ood/config/apps/bc_desktop/{{ cluster_name }}.yml
+    src: cluster.yml.erb.j2
+    dest: /etc/ood/config/apps/bc_desktop/{{ cluster_name }}.yml.erb
     backup: yes
 
 - name: Put submit.yml.erb in place

roles/ood/templates/cluster.yml roles/ood/templates/cluster.yml.j2

@@ -1,3 +1,6 @@
+<%-
+  partitions = OodAppkit.clusters[:{{ cluster_name }}].custom_config[:partitions]
+-%>
 ---
 title: "HPC Desktop"
 cluster: {{ cluster_name }}
@@ -23,8 +26,9 @@ attributes:
     widget: select
     label: Partition
     options:
-      - [ "defq", "defq" ]
-      - [ "low", "low" ]
+    <%- partitions.each do |p| -%>
+      - [ "<%= p %>", "<%= p %>" ]
+    <%- end -%>
 
 form:
   - desktop