Update main.yml

roles/mysql/tasks/main.yml

@@ -1,8 +1,6 @@
-    - name: Install MySQL (debuntu)
+- name: Install MySQL (debuntu)
   package:
-        name: "{{ item }}"
+    name:
-        state: present
-      with_items:
       - mariadb-server
       - mariadb-client
       - python-mysqldb
@@ -13,29 +11,28 @@
       - php{{ php_version }}-imap
       - php{{ php_version }}-ldap
       - php{{ php_version }}-odbc
-#        - php{{ php_version }}-xml
+      #- php{{ php_version }}-xml
       - php{{ php_version }}-xmlrpc
+    state: present
   when: is_debuntu
   tags:
     - download
 
-    - name: php-xml (ubuntu or debian-9)
+- name: php-xml (ubuntu or debian-9)
   package:
     name: "php{{ php_version }}-xml"
     state: present
   when: is_ubuntu or is_debian_9
 
-    - name: php-xml (debian-8)
+- name: php-xml (debian-8)
   package:
     name: "php-xml-parser"
     state: present
   when: is_debian_8
 
-    - name: Install MySQL (OS's other than debuntu)
+- name: Install MySQL (OS's other than debuntu)
   package:
-        name: "{{ item }}"
+    name:
-        state: present
-      with_items:
       - MySQL-python
       - mysql
       - php
@@ -47,27 +44,28 @@
       - php-odbc
       - php-xml
       - php-xmlrpc
+    state: present
   when: not is_debuntu
   tags:
     - download
 
-    - include_tasks: centos.yml
+- include_tasks: centos.yml
   when: ansible_distribution == "CentOS"
   tags:
     - download
 
-    - include_tasks: fedora.yml
+- include_tasks: fedora.yml
   when: ansible_distribution == "Fedora"
   tags:
     - download
 
 # Name of mysql service varies by OS so softcoded in 1-prep
-    - name: Start the MySQL service
+- name: Start the MySQL service
   service:
     name: "{{ mysql_service }}"
     state: started
 
-    - name: Enable the MySQL service
+- name: Enable the MySQL service
   service:
     name: "{{ mysql_service }}"
     enabled: yes
@@ -76,7 +74,7 @@
 # 'localhost' needs to be the last item for idempotency, see
 # http://ansible.cc/docs/modules.html#mysql-user
 # unfortunately it still doesn't work
-    - name: Update MySQL root password for localhost root accounts
+- name: Update MySQL root password for localhost root accounts
   mysql_user:
     name: root
     host: "{{ item }}"
@@ -86,7 +84,7 @@
     - localhost
   when: mysql_enabled
 
-    - name: Copy .my.cnf file with root password credentials
+- name: Install .my.cnf file from template, with root password credentials
   template:
     src: my.cnf.j2
     dest: /root/.my.cnf
@@ -94,46 +92,46 @@
     mode: 0600
   when: mysql_enabled
 
-    - name: Update MySQL root password for all remaining root accounts
+- name: Update MySQL root password for all remaining root accounts
   mysql_user:
     name: root
     host: "{{ item }}"
     password: "{{ mysql_root_password }}"
     priv: "*.*:ALL,GRANT"
   with_items:
-#        - "{{ iiab_hostname }}.{{ iiab_domain }}"
+    #- "{{ iiab_hostname }}.{{ iiab_domain }}"
     - 127.0.0.1
     - ::1
   when: mysql_enabled
 
-    - name: Delete anonymous MySQL server user for {{ ansible_hostname }}
+- name: Delete anonymous MySQL server user for {{ ansible_hostname }}
   mysql_user:
     user: ""
     host: "{{ ansible_hostname }}"
     state: absent
   when: mysql_enabled
 
-    - name: Delete anonymous MySQL server user for localhost
+- name: Delete anonymous MySQL server user for localhost
   mysql_user:
     user: ""
     state: absent
   when: mysql_enabled
 
-    - name: Remove the MySQL test database
+- name: Remove the MySQL test database
   mysql_db:
     db: test
     state: absent
   when: mysql_enabled
 
 # we had to start mysql in order to configure it, now turn if off if not enabled
-    - name: Provisionally Disable the MySQL service
+- name: Provisionally Disable the MySQL service
   service:
     name: "{{ mysql_service }}"
     enabled: no
     state: stopped
   when: not mysql_enabled
 
-    - name: Add 'mysql' to list of services at {{ iiab_ini_file }}
+- name: Add 'mysql' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: mysql