Merge pull request #58 from CVL-GitHub/cvl2branch

Cvl2branch

roles/cvl-menus/tasks/main.yml

+- name: Sanity check menu directory
+  shell: mkdir -p /etc/xdg/menus/applications-merged 
+  args:
+    creates: "/etc/xdg/menus/applications-merged"
+  sudo: true
+  
 - name: configure the cvl menues
   copy: src=cvl.menu dest=/etc/xdg/menus/applications-merged/cvl.menu mode=644 owner=root group=root
   sudo: true
 
 - name: configure the cvl backgroud image 
-  copy: src={{ item }} dest=/usr/share/backgrounds/i{{ item }} mode=644 owner=root group=root
+  copy: src={{ item }} dest=/usr/share/backgrounds/{{ item }} mode=644 owner=root group=root
   with_items:
     - cvl_desktop.svg
     - default.xml

roles/slurm-build/tasks/main.yml

@@ -11,14 +11,8 @@
     - pam-devel
     - perl-ExtUtils-MakeMaker
     - bzip2-devel
-
-- name: install deps in control node
-  yum: name={{ item }} state=installed
-  sudo: true
-  with_items:
     - mysql
     - mysql-devel
-  when: ansible_hostname == slurmctrl
 
 - name: get munge
   shell: wget https://munge.googlecode.com/files/munge-{{ munge_version }}.tar.bz2
@@ -62,7 +56,7 @@
     creates: /tmp/rpmbuild/RPMS/x86_64/slurm-{{ slurm_version }}-1.el6.x86_64.rpm
 
 - name: retrieve rpms 1
-  shell: scp -r {{ hostvars[ansible_hostname]['ansible_user_id'] }}@{{ ansible_ssh_host }}:/tmp/rpmbuild/ /tmp
+  shell: scp -o StrictHostKeyChecking=no -r {{ hostvars[ansible_hostname]['ansible_user_id'] }}@{{ ansible_ssh_host }}:/tmp/rpmbuild/ /tmp
   delegate_to: 127.0.0.1
   when: ansible_ssh_host is defined
 

roles/slurm/defaults/main.yml

 ---
 clustername: "CIAB" 
-#slurmctlddebug: 3
-#slurmddebug: 3
-#slurmdlogfile: /tmp/slurm/log/slurmd.log 
-#slurmctldlogfile: /tmp/slurm/log/slurmctld.log 
-#slurmschedlog: 9
-#slurmschedlogfile: /tmp/slurm/log/slurmsched.log
+slurmctlddebug: {} 
+slurmddebug: {} 
+slurmschedlog: {} 
+slurmdbdlog: {}
+slurmfairshare: {def: false, val: 10000}
+

roles/slurm/tasks/main.yml

@@ -49,6 +49,19 @@
   notify: restart slurm
   when: slurm_use_vpn==True
 
+- name: create data directory
+  shell: mkdir -p /var/spool/slurm 
+  args:
+    creates: "/var/spool/slurm"
+  sudo: true
+
+- name: create log directory
+  shell: mkdir -p {{ slurmddebug.log | dirname }} 
+  args:
+    creates: "{{ slurmddebug.log | dirname }}"
+  sudo: true
+  when: slurmddebug is defined and slurmddebug.log
+
 - name: start slurm
   service: name=slurm state=started
   sudo: true

roles/slurm/templates/slurm.conf.j2

@@ -74,23 +74,23 @@ FastSchedule=1
 #PriorityMaxAge=1-0
 #
 # LOGGING
-{% if slurmctlddebug and slurmctldlogfile %}
-SlurmctldDebug={{ slurmctlddebug }}
-SlurmctldLogFile={{ slurmctldlogfile }}
+{% if slurmctlddebug %}
+SlurmctldDebug={{ slurmctlddebug.level }}
+SlurmctldLogFile={{ slurmctlddebug.log }}
 {% else %}
 #SlurmctldDebug=
 #SlurmctldLogFile=
 {% endif %}
-{% if slurmddebug and slurmdlogfile %}
-SlurmdDebug={{ slurmddebug }}
-SlurmdLogFile={{ slurmdlogfile }}
+{% if slurmddebug %}
+SlurmdDebug={{ slurmddebug.level }}
+SlurmdLogFile={{ slurmddebug.log }}
 {% else %}
 #SlurmdDebug=
 #SlurmdLogFile=
 {% endif %}
-{% if slurmschedlog and slurmschedlogfile %}
-SlurmSchedlogLevel={{ slurmschedlog }}
-SlurmSchedLogFile={{ slurmschedlogfile }}
+{% if slurmschedlog %}
+SlurmSchedlogLevel={{ slurmschedlog.level }}
+SlurmSchedLogFile={{ slurmschedlog.log }}
 {% else %}
 #SlurmSchedlogLevel=
 #SlurmSchedLogFile=
@@ -104,15 +104,15 @@ JobCompType=jobcomp/none
 #
 AccountingStorageType=accounting_storage/slurmdbd
 AccountingStorageHost={{ slurmctrl }}
-AccountingStorageEnforce=limits,safe
+#AccountingStorageEnforce=limits,safe
 #AccountingStorageLoc=
 #AccountingStoragePass=
 #AccountingStorageUser=
 #
 
 # Fair share
-{% if slurmfairshare %}
-PriorityWeightFairshare={{ slurmfairshare }}
+{% if slurmfairshare.def %}
+PriorityWeightFairshare={{ slurmfairshare.val }}
 {% endif %}
 
 DisableRootJobs=YES

roles/slurmdb/tasks/main.yml

 ---
-- name: create slurmdb user
-  user: name=slurmdb group=slurmdb system=yes createhome=no
+- name: install deps in control node
+  yum: name={{ item }} state=installed
+  sudo: true
+  with_items:
+    - mysql
+    - mysql-server
+    - mysql-devel
+    - MySQL-python
+
+- name: "Start the Server"
+  service: "name=mysqld enabled=yes state=started"
+  sudo: true
+
+- name: install mysql local root password 
+  mysql_user: check_implicit_admin=True login_user=root login_password="{{ sqlrootPassword }}" name=root password="{{ sqlrootPassword }}" state=present
   sudo: true
 
 - name: install slurmdbd.conf
   template: src=slurmdbd.conf.j2 dest=/etc/slurm/slurmdbd.conf
   sudo: true
 
-- name: slurm db template 
-  template: src=slurmdb.sh.j2 dest=/etc/slurm/slurmdb.sh
+- name: configure database slurmdb localhost
+  mysql_user: login_user=root login_password="{{ sqlrootPassword }}" name=slurmdb password="{{ slurmDbPassword }}" host=localhost priv=*.*:ALL,GRANT state=present
+  sudo: true
+
+- name: configure database slurmdb domain 
+  mysql_user: login_user=root login_password="{{ sqlrootPassword }}" name=slurmdb password="{{ slurmDbPassword }}" host="{{ ansible_hostname }}"."{{ ansible_domain }}" priv=*.*:ALL,GRANT state=present
   sudo: true
-  notify: restart slurmdbd
+#  notify: restart slurmdb
+
+- name: sanity check slrumdbd service
+  service: "name=slurmdbd enabled=yes state=started"
+  sudo: true
+
+- name: sanity check slurm service
+  service: "name=slurm enabled=yes state=started"
+  sudo: true
+
+

roles/slurmdb/templates/slurmdbd.conf.j2

@@ -22,9 +22,9 @@ DbdHost={{ slurmctrl }}
 SlurmUser=slurm
 #MessageTimeout=300
 #DefaultQOS=normal,standby
-{% if slurmschedlog and slurmschedlogfile %}
-DebugLevel={{ slurmschedlog }}
-LogFile={{ slurmschedlogfile }}
+{% if slurmdbdlog %}
+DebugLevel={{ slurmdbdlog.level }}
+LogFile={{ slurmdbdlog.log }}
 {% else %}
 #DebugLevel=
 #LogFile=
@@ -38,7 +38,7 @@ PidFile=/var/run/slurmdbd.pid
 StorageType=accounting_storage/mysql
 StorageHost={{ slurmctrl }}
 #StoragePort=1234
-StoragePass=password
+StoragePass={{ slurmDbPassword }}
 StorageUser=slurmdb
 StorageLoc=slurm_acct_db