From c37878a5ce4eae917bae79e0fc0b461281013feb Mon Sep 17 00:00:00 2001
From: Martin Janser <martin@duss-janser.ch>
Date: Thu, 29 Sep 2016 21:05:49 +0200
Subject: [PATCH] Fix MariaDB upstream installation on Fedora

---
 Vagrantfile                      | 32 ++++++++++++++++----------------
 vars/mariadb/upstream/RedHat.yml | 10 ++++++++++
 2 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 vars/mariadb/upstream/RedHat.yml

diff --git a/Vagrantfile b/Vagrantfile
index 5f19b79..7f5da95 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -45,31 +45,31 @@ Vagrant.configure('2') do |config|
     ansible.playbook = 'playbook.yml'
     ansible.groups = {
         'mysql' => [
-            'fedora-24-mysql-dist',
-            'fedora-24-mysql-upstream',
-            'ubuntu-trusty-mysql-dist',
-            'ubuntu-trusty-mysql-upstream',
+            'mysql-dist-fedora-24',
+            'mysql-upstream-fedora-24',
+            'mysql-dist-ubuntu-trusty',
+            'mysql-upstream-ubuntu-trusty',
         ],
         'mysql:vars' => {'mysql_vendor' => 'mysql'},
         'mariadb' => [
-            'fedora-24-mariadb-dist',
-            'fedora-24-mariadb-upstream',
-            'ubuntu-trusty-mariadb-dist',
-            'ubuntu-trusty-mariadb-upstream',
+            'mariadb-dist-fedora-24',
+            'mariadb-upstream-fedora-24',
+            'mariadb-dist-ubuntu-trusty',
+            'mariadb-upstream-ubuntu-trusty',
         ],
         'mariadb:vars' => {'mysql_vendor' => 'mariadb'},
         'dist' => [
-            'fedora-24-mysql-dist',
-            'fedora-24-mariadb-dist',
-            'ubuntu-trusty-mysql-dist',
-            'ubuntu-trusty-mariadb-dist',
+            'mysql-dist-fedora-24',
+            'mariadb-dist-fedora-24',
+            'mysql-dist-ubuntu-trusty',
+            'mariadb-dist-ubuntu-trusty',
         ],
         'dist:vars' => {'mysql_origin' => 'distribution'},
         'upstream' => [
-            'fedora-24-mysql-upstream',
-            'fedora-24-mariadb-upstream',
-            'ubuntu-trusty-mysql-upstream',
-            'ubuntu-trusty-mariadb-upstream',
+            'mysql-upstream-fedora-24',
+            'mariadb-upstream-fedora-24',
+            'mysql-upstream-ubuntu-trusty',
+            'mariadb-upstream-ubuntu-trusty',
         ],
         'upstream:vars' => {'mysql_origin' => 'upstream'}
     }
diff --git a/vars/mariadb/upstream/RedHat.yml b/vars/mariadb/upstream/RedHat.yml
new file mode 100644
index 0000000..648ef9e
--- /dev/null
+++ b/vars/mariadb/upstream/RedHat.yml
@@ -0,0 +1,10 @@
+---
+mysql_packages:
+    - MariaDB-client
+    - MariaDB-server
+    - MySQL-python
+
+mysql_service: mariadb
+
+mysql_config_file: /etc/my.cnf
+mysql_config_dir: /etc/my.cnf.d