Merge pull request #61 from CVL-GitHub/cvl2branch

clean up

roles/openLdapClient/tasks/installOpenLdap.yml

@@ -9,7 +9,6 @@
     - sssd-client
     - nss
     - nss-tools
-    - nss-pam-ldapd
   sudo: true
   when: ansible_os_family == 'RedHat'
 

roles/slurmdb/tasks/main.yml

@@ -13,7 +13,7 @@
   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
+  mysql_user: check_implicit_admin=True login_user=root login_password="{{ sqlrootPasswd }}" name=root password="{{ sqlrootPasswd }}" state=present
   sudo: true
 
 - name: install slurmdbd.conf
@@ -21,11 +21,11 @@
   sudo: true
 
 - name: configure database slurmdb localhost
-  mysql_user: login_user=root login_password="{{ sqlrootPassword }}" name=slurmdb password="{{ slurmDbPassword }}" host=localhost priv=*.*:ALL,GRANT state=present
+  mysql_user: login_user=root login_password="{{ sqlrootPasswd }}" name=slurmdb password="{{ slurmdb_passwd }}" 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
+  mysql_user: login_user=root login_password="{{ sqlrootPasswd }}" name=slurmdb password="{{ slurmdb_passwd }}" host="{{ ansible_hostname }}"."{{ ansible_domain }}" priv=*.*:ALL,GRANT state=present
   sudo: true
 #  notify: restart slurmdb
 

roles/slurmdb/templates/slurmdbd.conf.j2

@@ -38,7 +38,7 @@ PidFile=/var/run/slurmdbd.pid
 StorageType=accounting_storage/mysql
 StorageHost={{ slurmctrl }}
 #StoragePort=1234
-StoragePass={{ slurmDbPassword }}
+StoragePass={{ slurmdb_passwd }}
 StorageUser=slurmdb
 StorageLoc=slurm_acct_db