Merge "Install MariaDB 10.1 client"

meta/main.yml

@@ -18,7 +18,7 @@ galaxy_info:
   description: Installation galera client
   company: Rackspace
   license: Apache2
-  min_ansible_version: 1.6.6
+  min_ansible_version: 2.1
   platforms:
     - name: Ubuntu
       versions:

releasenotes/notes/galera-client-mariadb-10-1-a90e0d2a89d6e76b.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - The galera_client role now installs MariaDB client version 10.1.
+  - For systems using the APT package manager, the sources file for
+    the MariaDB repo now has a consistent name, 'MariaDB.list'.

tasks/galera_client_install_apt.yml

@@ -53,9 +53,38 @@
   tags:
     - galera-client-apt-keys
 
-- name: Add galera repo(s)
+# TODO: Remove the following two tasks in Pike
+# They're only required during upgrades transitioning to a
+# statically named apt sources file.
+- name: Find old sources
+  command: >
+    grep -rnil maria /etc/apt/sources.list.d/ --exclude MariaDB.list
+  changed_when: false
+  failed_when: false
+  register: old_sources
+  tags:
+    - galera-client-repos
+
+- name: Remove old sources
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items: "{{ old_sources.stdout_lines | default([]) }}"
+  tags:
+    - galera-client-repos
+
+- name: Remove old galera repo
+  lineinfile:
+    dest: /etc/apt/sources.list.d/MariaDB.list
+    regexp: "^((?!{{ galera_client_repo }}).*)$"
+    state: absent
+  tags:
+    - galera-client-repos
+
+- name: Add galera repo
   apt_repository:
     repo: "{{ galera_client_repo }}"
+    filename: MariaDB
     state: present
     update_cache: yes
   register: add_repo

tasks/galera_client_install_yum.yml

@@ -68,20 +68,14 @@
   tags:
     - galera-gpg-keys
 
-#TODO(cloudnull) Remove this task once we move to Ansible 2.1
-# where we can leverage the `yum_repository` module:
-# https://docs.ansible.com/ansible/yum_repository_module.html
 - name: Add galera repo
-  copy:
-    content: |
-      [{{ item.name }}]
-      name={{ item.name }}
-      description={{ item.description }}
-      baseurl={{ item.baseurl }}
-      gpgkey={{ item.gpgkey }}
-      gpgcheck=1
-      enabled=1
-    dest: "/etc/yum.repos.d/{{ item.file }}.repo"
+  yum_repository:
+    name: "{{ item.name }}"
+    description: "{{ item.description }}"
+    baseurl: "{{ item.baseurl }}"
+    gpgkey: "{{ item.gpgkey }}"
+    gpgcheck: yes
+    enabled: yes
   register: add_repos
   until: add_repos|success
   retries: 5

vars/redhat-7.yml

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-galera_client_yum_repo_url: "http://yum.mariadb.org/10.0/centos/7/x86_64"
+galera_client_yum_repo_url: "http://yum.mariadb.org/10.1/centos/7/x86_64"
 galera_client_repo:
   state: "present"
   name: MariaDB

vars/ubuntu-14.04.yml

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Repositories
-galera_client_apt_repo_url: "http://mirror.rackspace.com/mariadb/repo/10.0/ubuntu"
+galera_client_apt_repo_url: "http://mirror.rackspace.com/mariadb/repo/10.1/ubuntu"
 galera_client_repo: "deb {{ galera_client_apt_repo_url }} {{ ansible_distribution_release }} main"
 
 galera_client_distro_packages:
@@ -28,7 +28,7 @@ galera_client_distro_packages:
   - libssl-dev
   - libstdc++6
   - mariadb-client
-  - mariadb-client-core-10.0
+  - mariadb-client-core-10.1
   - python-dev
 
 # Galera GPG Keys

vars/ubuntu-16.04.yml

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Repositories
-galera_client_apt_repo_url: "http://mirror.rackspace.com/mariadb/repo/10.0/ubuntu"
+galera_client_apt_repo_url: "http://mirror.rackspace.com/mariadb/repo/10.1/ubuntu"
 galera_client_repo: "deb {{ galera_client_apt_repo_url }} {{ ansible_distribution_release }} main"
 
 galera_client_distro_packages:
@@ -28,7 +28,7 @@ galera_client_distro_packages:
   - libssl-dev
   - libstdc++6
   - mariadb-client
-  - mariadb-client-core-10.0
+  - mariadb-client-core-10.1
   - python-dev
 
 # Galera GPG Keys