Merge "Pinned percona-xtrabackup to ensure stability"

playbooks/roles/galera_client/defaults/main.yml

@@ -39,10 +39,19 @@ galera_client_apt_percona_xtrabackup_repo:
   repo: "deb {{ galera_client_apt_percona_xtrabackup_url }} {{ ansible_distribution_release }} main"
   state: "present"
 
+galera_client_package_url: "https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.2.13/binary/debian/trusty/x86_64/percona-xtrabackup-22_2.2.13-1.trusty_amd64.deb"
+galera_client_package_sha256: "2f58eedefa905583f0650f77bb2b149139c4066c7fb690202124fe5c7ac83e9e"
+galera_client_package_path: "/opt/{{ galera_client_package_url | basename }}"
+
 galera_client_apt_packages:
+  - libaio1
+  - libc6
+  - libdbd-mysql-perl
+  - libgcc1
+  - libgcrypt11
   - libmariadbclient-dev
+  - libstdc++6
   - mariadb-client
-  - percona-xtrabackup
 
 galera_client_pip_packages:
   - MySQL-python

playbooks/roles/galera_client/tasks/galera_client_install.yml

@@ -36,6 +36,13 @@
   tags:
     - galera-client-apt-packages
 
+- name: Install galera package
+  apt:
+    deb: "{{ galera_client_package_path }}"
+    force: yes
+  tags:
+    - galera-client-apt-packages
+
 - name: Install pip packages
   pip:
     name: "{{ item }}"

playbooks/roles/galera_client/tasks/galera_client_pre_install.yml

@@ -63,3 +63,16 @@
     - "{{ galera_client_apt_percona_xtrabackup_repo }}"
   tags:
     - galera-client-repos
+
+- name: Download the galera package
+  get_url:
+    url: "{{ galera_client_package_url }}"
+    dest: "{{ galera_client_package_path }}"
+    mode: "0644"
+    sha256sum: "{{ galera_client_package_sha256 }}"
+  register: package_download
+  retries: 3
+  delay: 10
+  until: package_download|success
+  tags:
+    - galera-client-apt-packages

playbooks/roles/galera_server/defaults/main.yml

@@ -87,15 +87,25 @@ galera_apt_percona_xtrabackup_repo:
   repo: "deb {{ galera_apt_percona_xtrabackup_url }} {{ ansible_distribution_release }} main"
   state: "present"
 
+galera_package_url: "https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.2.13/binary/debian/trusty/x86_64/percona-xtrabackup-22_2.2.13-1.trusty_amd64.deb"
+galera_package_sha256: "2f58eedefa905583f0650f77bb2b149139c4066c7fb690202124fe5c7ac83e9e"
+galera_package_path: "/opt/{{ galera_package_url | basename }}"
+
 galera_pip_packages:
   - MySQL-python
   - python-memcached
   - pycrypto
 
 galera_pre_apt_packages:
+  - debconf-utils
+  - libaio1
+  - libc6
+  - libdbd-mysql-perl
+  - libgcc1
+  - libgcrypt11
+  - libstdc++6
   - python-software-properties
   - software-properties-common
-  - debconf-utils
 
 # The package name for mariaDB is set as a variable
 # so that it can be used in debconf later in the
@@ -111,7 +121,6 @@ galera_apt_packages:
   - galera-3
   - qpress
   - rsync
-  - percona-xtrabackup
   - socat
 
 galera_debconf_items:

playbooks/roles/galera_server/tasks/galera_install.yml

@@ -47,6 +47,13 @@
   tags:
     - galera-apt-packages
 
+- name: Install galera package
+  apt:
+    deb: "{{ galera_package_path }}"
+    force: yes
+  tags:
+    - galera-client-apt-packages
+
 - name: Install pip packages
   pip:
     name: "{{ item }}"

playbooks/roles/galera_server/tasks/galera_pre_install.yml

@@ -88,6 +88,19 @@
   tags:
     - galera-repos
 
+- name: Download the galera package
+  get_url:
+    url: "{{ galera_package_url }}"
+    dest: "{{ galera_package_path }}"
+    mode: "0644"
+    sha256sum: "{{ galera_package_sha256 }}"
+  register: package_download
+  retries: 3
+  delay: 10
+  until: package_download|success
+  tags:
+    - galera-apt-packages
+
 - name: Prevent galera from starting on install
   copy:
     src: "policy-rc.d"

playbooks/roles/repo_server/defaults/main.yml

@@ -66,7 +66,7 @@ repo_apt_packages:
   - libkrb5-dev
   - libkmod2
   - libvirt-dev
-  - libmysqlclient-dev
+  - libmariadbclient-dev
   - lxc-dev
   - lvm2
   - python-dev

scripts/gate-check-commit.sh

@@ -76,7 +76,7 @@ if [ -f /etc/nodepool/provider -a -s /etc/nodepool/provider ]; then
   # Reduce container affinities as Liberty appears to consume
   #  a greater volume of resources, causing greater numbers
   #  of failures with the default affinities.
-  for container_type in rabbit_mq repo galera horizon keystone; do
+  for container_type in rabbit_mq repo horizon keystone; do
     export "NUM_${container_type}_CONTAINER=1"
   done