diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-20 02:56:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-20 02:56:17 +0000 |
| commit | dc063ce776ee26234de4af8b2ecefab748245541 (patch) | |
| tree | 6da9faeb5ad25e29f4c90805b1ebcc725b56f8f9 | |
| parent | a0b14cfebf26c475490530c23a1360bc2bd41949 (diff) | |
| parent | 85d218ec447b180f0dc7b2a7270f8c798938df79 (diff) | |
| download | kolla-dc063ce776ee26234de4af8b2ecefab748245541.tar.gz kolla-dc063ce776ee26234de4af8b2ecefab748245541.zip | |
Merge "Fix the gate failure"
| -rwxr-xr-x | tools/setup_Debian.sh | 6 | ||||
| -rwxr-xr-x | tools/setup_RedHat.sh | 4 | ||||
| -rwxr-xr-x | tools/setup_gate.sh | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index deb645bd4..5e4f13986 100755 --- a/tools/setup_Debian.sh +++ b/tools/setup_Debian.sh @@ -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 diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh index e6e949a52..5a3f48458 100755 --- a/tools/setup_RedHat.sh +++ b/tools/setup_RedHat.sh @@ -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 diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index 8a3243d50..09a4d687a 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -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 |