Rename mysql_ -> mariadb_

tests/group_vars/all

@@ -1,6 +1,6 @@
-mysql_bind_address: '0.0.0.0'
-mysql_extra_configuration:
+mariadb_bind_address: '0.0.0.0'
+mariadb_extra_configuration:
   innodb_commit_concurrency: 0
-mysql_use_percona_apt: true
-mysql_install_xtrabackup_package: true
-mysql_slow_query_log_enabled: true
+mariadb_use_percona_apt: true
+mariadb_install_xtrabackup_package: true
+mariadb_slow_query_log_enabled: true

tests/group_vars/mariadbgalera

@@ -1,5 +1,5 @@
-mysql_vendor: 'mariadb_galera'
-mysql_galera_members:
+mariadb_vendor: 'mariadb_galera'
+mariadb_galera_members:
   - '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-mariadbgalera-1'
   - '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-mariadbgalera-2'
   - '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-mariadbgalera-3'

tests/group_vars/master

@@ -1,18 +1,18 @@
 # Master durability
-mysql_sync_binlog: '1'
-mysql_innodb_flush_log_at_trx_commit: '1'
+mariadb_sync_binlog: '1'
+mariadb_innodb_flush_log_at_trx_commit: '1'
 
-mysql_databases:
+mariadb_databases:
   - 'testrepl'
   - 'norepl'
 
-mysql_users:
+mariadb_users:
   - name: 'replication'
     password: '1a2b3c'
     priv: '*.*:REPLICATION SLAVE'
     host: '%'
-mysql_replication_master: true
-mysql_replication_slave: false
-mysql_server_id: 1
+mariadb_replication_master: true
+mariadb_replication_slave: false
+mariadb_server_id: 1
 
 # vim: set ft=yaml :

tests/group_vars/mysql

@@ -1 +1 @@
-mysql_vendor: 'mysql'
+mariadb_vendor: 'mysql'

tests/group_vars/slave

@@ -1,8 +1,8 @@
-mysql_replication_master: false
-mysql_replication_slave: true
-mysql_replication_user: 'replication'
-mysql_replication_password: '1a2b3c'
-mysql_server_id: 2
-mysql_slave_ignore_db: ['norepl']
+mariadb_replication_master: false
+mariadb_replication_slave: true
+mariadb_replication_user: 'replication'
+mariadb_replication_password: '1a2b3c'
+mariadb_server_id: 2
+mariadb_slave_ignore_db: ['norepl']
 
 # vim: set ft=yaml :

tests/test.yml

@@ -27,18 +27,18 @@
       changed_when: false
     - set_fact:
         # MySQL don't read /etc/hosts (from vagrant host plugin)
-        mysql_replication_host: "{{ ip.stdout }}"
+        mariadb_replication_host: "{{ ip.stdout }}"
         # Need this to use vagrant 'delegate_to'
-        mysql_slave_import_from: "{{ ansible_hostname | replace ('slave', 'master') }}"
+        mariadb_slave_import_from: "{{ ansible_hostname | replace ('slave', 'master') }}"
   roles:
     - ../../
   tasks:
     - copy: src=import2.sql dest=/tmp/import2.sql
-      delegate_to: "{{ mysql_slave_import_from }}"
+      delegate_to: "{{ mariadb_slave_import_from }}"
       register: c
     - mysql_db: name={{ item }} state=import target=/tmp/import2.sql
       with_items: ['testrepl', 'norepl']
-      delegate_to: "{{ mysql_slave_import_from }}"
+      delegate_to: "{{ mariadb_slave_import_from }}"
       when: c.changed
     - mysql_replication: mode=getslave
       register: slave
@@ -47,12 +47,12 @@
 
 - hosts: mariadbgalera
   vars:
-    mysql_galera_primary_node: '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-mariadbgalera-1'
-    mysql_wsrep_node_address: "{{ ansible_all_ipv4_addresses[0] }}"
-    mysql_mariadb_version: '10.1'
+    mariadb_galera_primary_node: '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-mariadbgalera-1'
+    mariadb_wsrep_node_address: "{{ ansible_all_ipv4_addresses[0] }}"
+    mariadb_mariadb_version: '10.1'
   pre_tasks:
     - set_fact:
-        mysql_wsrep_node_address: "{{ ansible_eth1.ipv4.address }}"
+        mariadb_wsrep_node_address: "{{ ansible_eth1.ipv4.address }}"
       when: not is_docker
   roles:
     - ../../

tests/travis.sh

@@ -12,10 +12,10 @@ set -ev
 ansible-playbook -i $INVENTORY_FILE -c local --syntax-check -vv $PLAYBOOK
 
 # Check role
-ansible-playbook -i $INVENTORY_FILE -c local -e "{ mysql_vendor: $VENDOR, mysql_origin: $ORIGIN }" --sudo -vv $PLAYBOOK
+ansible-playbook -i $INVENTORY_FILE -c local -e "{ mariadb_vendor: $VENDOR, mariadb_origin: $ORIGIN }" --sudo -vv $PLAYBOOK
 
 # Check indempotence
-ansible-playbook -i $INVENTORY_FILE -c local -e "{ mysql_vendor: $VENDOR, mysql_origin: $ORIGIN }" --sudo -vv $PLAYBOOK > idempot.txt
+ansible-playbook -i $INVENTORY_FILE -c local -e "{ mariadb_vendor: $VENDOR, mariadb_origin: $ORIGIN }" --sudo -vv $PLAYBOOK > idempot.txt
 grep -q 'changed=0.*failed=0' idempot.txt \
 && (echo 'Idempotence test: pass' && exit 0) \
 || (echo 'Idempotence test: FAIL' && cat idempot.txt && exit 1)

tests/travis.yml

@@ -2,11 +2,11 @@
 
 - hosts: all
   vars:
-    mysql_replication_master: true
-    mysql_bind_address: '{{ ansible_eth0.ipv4.address }}'
-    mysql_galera_members:
+    mariadb_replication_master: true
+    mariadb_bind_address: '{{ ansible_eth0.ipv4.address }}'
+    mariadb_galera_members:
       - '{{ ansible_eth0.ipv4.address }}'
-    mysql_galera_primary_node: 'localhost'
+    mariadb_galera_primary_node: 'localhost'
   roles:
     - ../../
   post_tasks: