openstack/kolla
Code Issues Proposed changes

Merge "Fix detect_distro"

Browse Source
This commit is contained in:
Jenkins 2016-02-14 20:23:26 +00:00 committed by Gerrit Code Review
commit dda86e6d03
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/setup_gate.sh
View File

@ -14,7 +14,14 @@ function setup_config {
# Copy configs # Copy configs
sudo cp -a etc/kolla /etc/ sudo cp -a etc/kolla /etc/
# 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
if [[ "${DISTRO}" == "Debian" ]]; then if [[ "${DISTRO}" == "Debian" ]]; then
# Infra does not sign thier mirrors so we ignore gpg signing in the gate
echo "RUN echo 'APT::Get::AllowUnauthenticated \"true\";' > /etc/apt/apt.conf" | sudo tee -a /etc/kolla/header
# Optimize the repos to take advantage of the Infra provided mirrors for Ubuntu # 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 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 sudo cp /etc/apt/sources.list /etc/kolla/sources.list
@ -26,10 +33,6 @@ deb http://repo.percona.com/apt trusty main
deb http://download.ceph.com/debian-hammer/ trusty main deb http://download.ceph.com/debian-hammer/ trusty main
EOF EOF
fi 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 { function detect_distro {
@ -79,6 +82,7 @@ function setup_ansible {
mkdir /tmp/kolla mkdir /tmp/kolla
sudo -H pip install "ansible<2" "docker-py>=1.6.0" sudo -H pip install "ansible<2" "docker-py>=1.6.0"
detect_distro
setup_inventory setup_inventory
@ -100,7 +104,6 @@ function setup_logging {
mkdir -p /tmp/logs/{ansible,build} mkdir -p /tmp/logs/{ansible,build}
} }
detect_distro
setup_logging setup_logging
tools/dump_info.sh tools/dump_info.sh
setup_ssh setup_ssh