Add MariaDB version support

PCextreme · Dec 22, 2014 · beb490f · beb490f
1 parent a5822ef
commit beb490f
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -19,6 +19,12 @@ None
 
 ## Role Variables
 
+MariaDB version:
+
+```
+mariadb_version: 10.0
+```
+
 Configuration template:
 
 ```

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,3 +1,5 @@
 ---
+mariadb_version: 10.0
+
 mysql_conf_tpl: change_me
 mysql_conf_file: settings.cnf
diff --git a/files/mariadb_centos6.repo b/files/mariadb_centos6.repo
diff --git a/files/mariadb_centos7.repo b/files/mariadb_centos7.repo
diff --git a/files/mariadb_trusty.list b/files/mariadb_trusty.list
diff --git a/tasks/centos.yml b/tasks/centos.yml
@@ -1,6 +1,6 @@
 ---
 - name: Add repo file
- copy: src=mariadb_centos{{ ansible_distribution_major_version|int }}.repo dest=/etc/yum.repos.d/mariadb.repo owner=root group=root mode=0644
+ template: src=mariadb_centos.repo.j2 dest=/etc/yum.repos.d/mariadb.repo owner=root group=root mode=0644
 
 - name: Install MariaDB
  yum: enablerepo=mariadb state=present name={{ item }}

diff --git a/tasks/ubuntu.yml b/tasks/ubuntu.yml
@@ -1,6 +1,6 @@
 ---
 - name: Add APT repo file
- copy: src=mariadb_trusty.list dest=/etc/apt/sources.list.d/mariadb.list owner=root group=root mode=0644
+ template: src=mariadb_ubuntu.list.j2 dest=/etc/apt/sources.list.d/mariadb.list owner=root group=root mode=0644
  register: mariadb_list
 
 - name: Add APT repo key
@@ -15,12 +15,6 @@
  shell: export DEBIAN_FRONTEND=noninteractive
  changed_when: false
 
-#- name: Set MySQL root password
-# shell: "debconf-set-selections <<< 'mariadb-server mysql-server/root_password password {{ mysql_root_password }}'"
-
-#- name: Set MySQL root password again
-# shell: "debconf-set-selections <<< 'mariadb-server mysql-server/root_password_again password {{ mysql_root_password }}'"
-
 - name: Install MariaDB
  apt: state=present pkg={{ item }}
  with_items:

diff --git a/templates/mariadb_centos.repo.j2 b/templates/mariadb_centos.repo.j2
@@ -0,0 +1,7 @@
+# MariaDB CentOS {{ ansible_distribution_major_version|int }} repository list
+# http://mariadb.org/mariadb/repositories/
+[mariadb]
+name = MariaDB
+baseurl = http://yum.mariadb.org/{{ mariadb_version }}/centos{{ ansible_distribution_major_version|int }}-amd64
+gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+gpgcheck=1
diff --git a/templates/mariadb_ubuntu.list.j2 b/templates/mariadb_ubuntu.list.j2
@@ -0,0 +1,4 @@
+# MariaDB Ubuntu {{ ansible_distribution_release | title }} repository list
+# http://mariadb.org/mariadb/repositories/
+deb http://ams2.mirrors.digitalocean.com/mariadb/repo/{{ mariadb_version }}/ubuntu {{ ansible_distribution_release | lower }} main
+deb-src http://ams2.mirrors.digitalocean.com/mariadb/repo/{{ mariadb_version }}/ubuntu {{ ansible_distribution_release | lower }} main