openstack
/
kolla
Code Issues Proposed changes

Fix the gate failure 

* Push images all the time
* Pin docker-engine version

Change-Id: Ie778f719655c1136e563ede9e494b37817e247fa
This commit is contained in:
Jeffrey Zhang 2017-01-19 10:15:48 +08:00
parent fa09b3e077
commit 85d218ec44
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/setup_Debian.sh
View File

@ -57,13 +57,13 @@ source /etc/lsb-release
echo "deb http://apt.dockerproject.org/repo ubuntu-${DISTRIB_CODENAME} main" | sudo tee /etc/apt/sources.list.d/docker.list
add_key
sudo apt-get update
sudo apt-get -y install --no-install-recommends docker-engine
sudo apt-get -y install --no-install-recommends 'docker-engine=1.12.*'
sudo service docker stop
if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then
sudo apt-get -y install --no-install-recommends btrfs-tools
setup_disk
echo 'DOCKER_OPTS="-s btrfs"' | sudo tee /etc/default/docker
echo "DOCKER_OPTS=\"-s btrfs --insecure-registry $(cat /etc/nodepool/primary_node_private):4000\"" | sudo tee /etc/default/docker
sudo mount --make-shared /run
sudo service docker start
else
@ -71,7 +71,7 @@ else
sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF
[Service]
ExecStart=
ExecStart=/usr/bin/dockerd --storage-driver overlay2 --insecure-registry=127.0.0.1:4000
ExecStart=/usr/bin/dockerd --storage-driver overlay2 --insecure-registry $(cat /etc/nodepool/primary_node_private):4000
MountFlags=shared
EOF
sudo systemctl daemon-reload

4
tools/setup_RedHat.sh
View File

@ -44,7 +44,7 @@ gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg
EOF
sudo yum -y install libffi-devel openssl-devel docker-engine btrfs-progs
sudo yum -y install libffi-devel openssl-devel docker-engine-1.12.6 docker-engine-selinux-1.12.6 btrfs-progs
setup_disk
@ -53,7 +53,7 @@ sudo mkdir /etc/systemd/system/docker.service.d
sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF
[Service]
ExecStart=
ExecStart=/usr/bin/dockerd --storage-driver btrfs --insecure-registry=127.0.0.1:4000
ExecStart=/usr/bin/dockerd --storage-driver btrfs --insecure-registry=$(cat /etc/nodepool/primary_node_private):4000
MountFlags=shared
EOF

6
tools/setup_gate.sh
View File

@ -42,10 +42,8 @@ EOF
# NOTE(Jeffrey4l): use different a docker namespace name in case it pull image from hub.docker.io when deplying
sed -i 's|^#namespace.*|namespace = lokolla|' /etc/kolla/kolla-build.conf
if [[ -n "${PACK_REGISTRY}" ]] && [[ $ACTION == "build" ]]; then
sed -i 's|^#registry.*|registry = 127.0.0.1:4000|' /etc/kolla/kolla-build.conf
sed -i 's|^#push.*|push = true|' /etc/kolla/kolla-build.conf
fi
sed -i 's|^#registry.*|registry = 127.0.0.1:4000|' /etc/kolla/kolla-build.conf
sed -i 's|^#push.*|push = true|' /etc/kolla/kolla-build.conf
if [[ "${DISTRO}" == "Debian" ]]; then
# Infra does not sign their mirrors so we ignore gpg signing in the gate