origin is now default or upstream

README.md

@@ -13,12 +13,12 @@ None.
 Role Variables
 --------------
 
-- `mysql_origin`: origin of the package ("default", "mariadb", "percona")
+- `mysql_origin`: origin of the package ("default" or "upstream")
 - `mysql_vendor`: "mysql", "mariadb" or "percona"
 
 ### Configuration
 
-- mysql\_cnf: key/value hash see [defaults/main.yml](default vars file)
+- `mysql_cnf`: key/value hash see [defaults/main.yml](default vars file)
 - `mysql_root_password`: root password (should be protected with [vault](http://docs.ansible.com/playbooks_vault.html))
 
 ### Databases
@@ -31,7 +31,7 @@ Role Variables
 Example:
 
 ```
-mysql\_users:
+mysql_users:
   - name: 'kiki'
     password: '123'
     priv: hihi.*:ALL

defaults/main.yml

@@ -3,7 +3,7 @@
 # -------------------------------------
 # Setup
 # -------------------------------------
-mysql_origin: 'mariadb'
+mysql_origin: 'upstream'
 mysql_vendor: 'mariadb'
 mysql_root_password: 'change_me_NOW'
 

tasks/install.yml

@@ -6,8 +6,8 @@
     not (
     (mysql_origin == 'default' and mysql_vendor == 'mysql') or
     (mysql_origin == 'default' and mysql_vendor == 'mariadb' and ansible_distribution_major_version > 7) or
-    (mysql_origin == 'mariadb' and mysql_vendor == 'mariadb') or
-    (mysql_origin ==  'percona' and mysql_vendor == 'percona')
+    (mysql_origin == 'upstream' and mysql_vendor == 'mariadb') or
+    (mysql_origin ==  'upstream' and mysql_vendor == 'percona')
     )
 
 - name: APT | Update cache
@@ -22,12 +22,12 @@
   when: mysql_origin == 'default' and mysql_vendor == 'mariadb' and ansible_distribution_major_version > 7
 
 - name: INCLUDE | Install MariaDB from MariaDB repo
-  include: 'install_mariadb_mariadb.yml'
-  when: mysql_origin == 'mariadb' and mysql_vendor == 'mariadb'
+  include: 'install_upstream_mariadb.yml'
+  when: mysql_origin == 'upstream' and mysql_vendor == 'mariadb'
 
 - name: INCLUDE | Install Percona Server from Percona repo
-  include: 'install_percona_percona.yml'
-  when: mysql_origin ==  'percona' and mysql_vendor == 'percona'
+  include: 'install_upstream_percona.yml'
+  when: mysql_origin ==  'upstream' and mysql_vendor == 'percona'
 
 - name: APT | Install few MySQL related tools
   apt: pkg={{ item }} state=latest