Fix MariaDB upstream installation on Fedora

mjanser · Sep 29, 2016 · c37878a · c37878a
1 parent 6e0ad5d
commit c37878a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git 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
@@ -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