Merge remote-tracking branch 'origin/master' into upcomingMaintenance

roles/collectd/tasks/main.yml

@@ -7,7 +7,7 @@
   become_user: root
 
 - name: install collectd - RHEL7
-  yum: name=collectd state=present enablerepo="Monash_University_EPEL7_EPEL_7_-_x86_64"
+  yum: name=collectd state=present enablerepo="org_monash_uni_EPEL_7_EPEL_7_-_x86_64"
   when:
    - '"DGX" in ansible_product_name'
    - '"RedHat" in ansible_distribution'

roles/extra_packages/tasks/main.yml

@@ -36,7 +36,7 @@
     exclude: "{{ excludes|join(',') }}"
     update_cache: yes
     state: present
-    enablerepo: Monash_University_EPEL7_EPEL_7_-_x86_64
+    enablerepo: "org_monash_uni_EPEL_7_EPEL_7_-_x86_64"
   become: true
   become_user: root
   when:

roles/lmod/tasks/main.yml

@@ -19,7 +19,7 @@
   yum:
     state: present
     update_cache: yes
-    enablerepo: "Monash_University_EPEL7_EPEL_7_-_x86_64"
+    enablerepo: "org_monash_uni_EPEL_7_EPEL_7_-_x86_64"
     name:
       - lua
       - lua-filesystem

roles/mysql/tasks/CentOS_7_mysql_server.yml

@@ -56,8 +56,8 @@
   mysql_user: name={{ mysql_user_name }} host={{ hostvars[item].ansible_fqdn }} password={{ mysql_user_password }} login_user=root login_password={{ mysql_root_password }} priv={{ mysql_user_db_name }}.*:ALL,GRANT state=present
   with_items: "{{ mysql_user_hosts_group }}"
   when: mysql_user_hosts_group is defined
-  
+
 - name: "Giving priviliges to user with shortname"
-  mysql_user: name={{ mysql_user_name }} host={{ inventory_hostname }} password={{ mysql_user_password }} login_user=root login_password={{ mysql_root_password }} priv={{ mysql_user_db_name }}.*:ALL,GRANT state=present
+  mysql_user: name={{ mysql_user_name }} host={{ item }} password={{ mysql_user_password }} login_user=root login_password={{ mysql_root_password }} priv={{ mysql_user_db_name }}.*:ALL,GRANT state=present
   with_items: "{{ mysql_user_hosts_group }}"
-  when: mysql_user_hosts_group is defined  
+  when: mysql_user_hosts_group is defined

roles/mysql/tasks/Ubuntu_18_mysql_server.yml

@@ -51,4 +51,4 @@
   with_items: "{{ mysql_user_hosts_group }}"
   when: mysql_user_hosts_group is defined
   become: true
-  become_user: root
\ No newline at end of file
+  become_user: root