Merge "Use Infra provided mirrors in gate"
This commit is contained in:
commit
51e9046ea7
@ -13,6 +13,23 @@ function setup_config {
|
||||
tox -e genconfig
|
||||
# Copy configs
|
||||
sudo cp -a etc/kolla /etc/
|
||||
|
||||
if [[ "${DISTRO}" == "Debian" ]]; then
|
||||
# Optimize the repos to take advantage of the Infra provided mirrors for Ubuntu
|
||||
sed -i 's|^#apt_sources_list.*|apt_sources_list = /etc/kolla/sources.list|' /etc/kolla/kolla-build.conf
|
||||
sudo cp /etc/apt/sources.list /etc/kolla/sources.list
|
||||
# Append non-infra provided repos to list
|
||||
cat << EOF | sudo tee -a /etc/kolla/sources.list
|
||||
deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/liberty main
|
||||
deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main
|
||||
deb http://repo.percona.com/apt trusty main
|
||||
deb http://download.ceph.com/debian-hammer/ trusty main
|
||||
EOF
|
||||
fi
|
||||
|
||||
# Use Infra provided pypi
|
||||
echo "RUN echo $(base64 -w0 /etc/pip.conf) | base64 -d > /etc/pip.conf" | sudo tee /etc/kolla/header
|
||||
sed -i 's|^#include_header.*|include_header = /etc/kolla/header|' /etc/kolla/kolla-build.conf
|
||||
}
|
||||
|
||||
function detect_distro {
|
||||
@ -39,7 +56,6 @@ function setup_ssh {
|
||||
function setup_inventory {
|
||||
local counter=0
|
||||
|
||||
detect_distro
|
||||
if [[ "${DISTRO}" == "Debian" ]]; then
|
||||
ANSIBLE_CONNECTION_TYPE=ssh
|
||||
else
|
||||
@ -84,6 +100,7 @@ function setup_logging {
|
||||
mkdir -p /tmp/logs/{ansible,build}
|
||||
}
|
||||
|
||||
detect_distro
|
||||
setup_logging
|
||||
tools/dump_info.sh
|
||||
setup_ssh
|
||||
|
Loading…
Reference in New Issue
Block a user