Use OpenStack infrastructure MariaDB mirrors

We have mirrored provided by the OpenStack infrastructure which
should reduce the amount of network failures with MariaDB.

Also, use nodepool variables so that we use our infrastructure
provided mirrors.

Depends-On: I49a744ee5c41279f4a17bc7d2339d12c3a132026
Change-Id: I81f716f640f6742c787e7aaedfdbf942893142de
This commit is contained in:
Mohammed Naser 2018-06-27 10:29:30 -04:00
parent 3731e25b43
commit 6b705298a5
6 changed files with 6 additions and 13 deletions

View File

@ -20,6 +20,7 @@ galera_address: 127.0.0.1
galera_root_user: root
# Set the URL for the MariaDB repository
galera_repo_host: downloads.mariadb.com
galera_client_repo_url: "{{ galera_repo_url | default(_galera_client_repo_url) }}"
# Set the major version to use for the galera repo

View File

@ -19,6 +19,7 @@
user: root
become: true
pre_tasks:
- include: "common/common-tasks/test-set-nodepool-vars.yml"
# These directories are removed because the gate job has them in
# the base image.
- name: Remove local mysql directories if they exist

View File

@ -13,10 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# TODO(odyssey4me):
# The use of 'galera_client_yum_repo_url' below is for backwards compatibility
# to settings released in Newton. It can be removed in Queens.
_galera_client_repo_url: "{{ galera_client_yum_repo_url | default('http://downloads.mariadb.com/MariaDB/mariadb-' ~ galera_client_major_version ~ '.' ~ galera_client_minor_version ~ '/yum/centos7-amd64/') }}"
_galera_client_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_client_major_version }}.{{ galera_client_minor_version }}/yum/centos7-amd64/"
_galera_client_repo:
state: "present"
name: MariaDB

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
_galera_client_repo_url: "http://downloads.mariadb.com/MariaDB/mariadb-{{ galera_client_major_version }}.{{ galera_client_minor_version }}/yum/opensuse42-amd64"
_galera_client_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_client_major_version }}.{{ galera_client_minor_version }}/yum/opensuse42-amd64"
_galera_client_repo:
name: MariaDB
description: "MariaDB Repo"

View File

@ -14,10 +14,7 @@
# limitations under the License.
# Repositories
# TODO(odyssey4me):
# The use of 'galera_client_apt_repo_url' below is for backwards compatibility
# to settings released in Newton. It can be removed in Queens.
_galera_client_repo_url: "{{ galera_client_apt_repo_url | default('http://downloads.mariadb.com/MariaDB/mariadb-' ~ galera_client_major_version ~ '.' ~ galera_client_minor_version ~ '/repo/ubuntu') }}"
_galera_client_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_client_major_version }}.{{ galera_client_minor_version }}/repo/ubuntu"
_galera_client_repo: "deb {{ galera_client_repo_url }} {{ ansible_distribution_release }} main"
# libmariadbclient-dev is required for mysql_config, which is subsequently required for pip install of MySQL-python

View File

@ -14,10 +14,7 @@
# limitations under the License.
# Repositories
# TODO(odyssey4me):
# The use of 'galera_client_apt_repo_url' below is for backwards compatibility
# to settings released in Newton. It can be removed in Queens.
_galera_client_repo_url: "{{ galera_client_apt_repo_url | default('http://downloads.mariadb.com/MariaDB/mariadb-' ~ galera_client_major_version ~ '.' ~ galera_client_minor_version ~ '/repo/ubuntu') }}"
_galera_client_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_client_major_version }}.{{ galera_client_minor_version }}/repo/ubuntu"
# Temporarily replace {{ ansible_distribution_release }} with artful, as bionic
# support is not provided yet
#_galera_client_repo: "deb {{ galera_client_repo_url }} {{ ansible_distribution_release }} main"