diff --git a/roles/cvl-menus/tasks/main.yml b/roles/cvl-menus/tasks/main.yml
index bc6cdf091b57b3aa528769f9e893e847eef74e29..b103cde02503c65a51d0f8f7a7614596ccd91882 100644
--- a/roles/cvl-menus/tasks/main.yml
+++ b/roles/cvl-menus/tasks/main.yml
@@ -1,9 +1,15 @@
+- 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
diff --git a/roles/slurm-build/tasks/main.yml b/roles/slurm-build/tasks/main.yml
index 4b3db43f612dc0657e144c16fbb16d15fb5d882d..98d5a14c6d247a96e311bc0c9ae1c3bf2c3c7e87 100644
--- a/roles/slurm-build/tasks/main.yml
+++ b/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
diff --git a/roles/slurm/defaults/main.yml b/roles/slurm/defaults/main.yml
index 7bf688a8a430b8da97f6d83b75ab29ffee28cf2b..8de2e61a15d0920a315364db8a83e3762e8fc97c 100644
--- a/roles/slurm/defaults/main.yml
+++ b/roles/slurm/defaults/main.yml
@@ -1,8 +1,8 @@
---
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}
+
diff --git a/roles/slurm/tasks/main.yml b/roles/slurm/tasks/main.yml
index 9817008347d76bb696384771d4f89f7a7c90fec2..1cc85b919195ea102c531004c8a67257f59578d6 100644
--- a/roles/slurm/tasks/main.yml
+++ b/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
diff --git a/roles/slurm/templates/slurm.conf.j2 b/roles/slurm/templates/slurm.conf.j2
index 8c4def4c6db5c851ea4b9c6b8b7d1de469b57ac0..202480a58d9e95975a7dd397bfb992daadd4807d 100644
--- a/roles/slurm/templates/slurm.conf.j2
+++ b/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
diff --git a/roles/slurmdb/tasks/main.yml b/roles/slurmdb/tasks/main.yml
index 07d6bbeb1c68d84df7d596938b5fe94d73298b3d..c332c5638efeafd4dc2ead16d7f7ade0d7798108 100644
--- a/roles/slurmdb/tasks/main.yml
+++ b/roles/slurmdb/tasks/main.yml
@@ -1,13 +1,40 @@
---
-- 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
+
+
diff --git a/roles/slurmdb/templates/slurmdbd.conf.j2 b/roles/slurmdb/templates/slurmdbd.conf.j2
index fbc4a56d4c58304a63133ab0b0258deed8802b02..bec8e9647356cd8814d2e2892722cd61d03617c5 100644
--- a/roles/slurmdb/templates/slurmdbd.conf.j2
+++ b/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