diff --git a/playbooks/roles/galera_client/tasks/galera_client_install.yml b/playbooks/roles/galera_client/tasks/galera_client_install.yml index ad0a7ca845..b7d012d725 100644 --- a/playbooks/roles/galera_client/tasks/galera_client_install.yml +++ b/playbooks/roles/galera_client/tasks/galera_client_install.yml @@ -36,6 +36,23 @@ tags: - galera-client-apt-packages +# TODO(cloudnull) -- Remove this after the Mitaka release +# This task simply removes the system version of +# percona-xtrabackup and xtrabackup if found the +# purpose is to ensure that "if" the system version +# of the binary is installed its first removed in +# favor of the actual upstream package being used in +# the next task. +- name: UnInstall system xtrabackup packages + apt: + pkg: "{{ item }}" + state: absent + with_items: + - percona-xtrabackup + - xtrabackup + tags: + - galera-client-apt-packages + - name: Install galera package apt: deb: "{{ galera_client_package_path }}" diff --git a/playbooks/roles/galera_server/defaults/main.yml b/playbooks/roles/galera_server/defaults/main.yml index 6ac41630bc..13602196ba 100644 --- a/playbooks/roles/galera_server/defaults/main.yml +++ b/playbooks/roles/galera_server/defaults/main.yml @@ -77,7 +77,7 @@ galera_gpg_keys: hash_id: '0x1c4cbdcdcd2efd2a' # Repositories -galera_apt_repo_url: "https://mirror.rackspace.com/mariadb/repo/5.5/ubuntu" +galera_apt_repo_url: "https://mirror.rackspace.com/mariadb/repo/10.0/ubuntu" galera_apt_repo: repo: "deb {{ galera_apt_repo_url }} {{ ansible_distribution_release }} main" state: "present" diff --git a/playbooks/roles/galera_server/tasks/galera_install.yml b/playbooks/roles/galera_server/tasks/galera_install.yml index 5d25320f6b..71dce4c2ff 100644 --- a/playbooks/roles/galera_server/tasks/galera_install.yml +++ b/playbooks/roles/galera_server/tasks/galera_install.yml @@ -47,12 +47,29 @@ tags: - galera-apt-packages +# TODO(cloudnull) -- Remove this after the Mitaka release +# This task simply removes the system version of +# percona-xtrabackup and xtrabackup if found the +# purpose is to ensure that "if" the system version +# of the binary is installed its first removed in +# favor of the actual upstream package being used in +# the next task. +- name: UnInstall system xtrabackup packages + apt: + pkg: "{{ item }}" + state: absent + with_items: + - percona-xtrabackup + - xtrabackup + tags: + - galera-apt-packages + - name: Install galera package apt: deb: "{{ galera_package_path }}" force: yes tags: - - galera-client-apt-packages + - galera-apt-packages - name: Install pip packages pip: