Add MariaDB infrastructure mirrors and disable nested virt

In order to ensure that deployment tests make use of the
OpenStack-CI cached resources, we implement the override
to consume them for the MariaDB packages.

We also disable nested virt as has been done in the newer
series in Ifae3425b66254aa655df5b6bb95896da1cccc32a

Depends-On: https://review.openstack.org/619694
Depends-On: https://review.openstack.org/619690
Change-Id: Id6982945509a174b0aaa74ccbdfa45adc5cfbb7a
(cherry picked from commit 28f71196cd)
This commit is contained in:
Jesse Pretorius 2018-11-22 11:56:36 +00:00
parent 6c807e91fe
commit 944f682f85
2 changed files with 4 additions and 5 deletions

View File

@ -13,11 +13,11 @@
- name: galera_client
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-galera_client
version: acc843866fc2741f0c7ac021b06dad4a6da92f9b
version: eaf94b354d5a9a18152fa331f01c46fc610343a5
- name: galera_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-galera_server
version: 7e970a476deea040aa4d1ac50b976fff43a90499
version: 1ce63ac6de360b2f9695d7d714a756386429bc73
- name: ceph_client
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-ceph_client

View File

@ -76,9 +76,8 @@
NODEPOOL_OVERRIDES="/etc/openstack_deploy/user_openstackci.yml"
echo "uca_apt_repo_url: '${NODEPOOL_UCA_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
echo "openstack_hosts_centos_mirror_url: '${NODEPOOL_CENTOS_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
if [[ ${NODEPOOL_PYPI_MIRROR} == *.ovh.* ]]; then
echo "nova_virt_type: 'qemu'" >> ${NODEPOOL_OVERRIDES}
fi
echo "galera_repo_host: '${NODEPOOL_MIRROR_HOST}:8080'" >> ${NODEPOOL_OVERRIDES}
echo "nova_virt_type: 'qemu'" >> ${NODEPOOL_OVERRIDES}
echo "repo_build_pip_default_index: '${NODEPOOL_PYPI_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
args:
executable: /bin/bash