aboutsummaryrefslogtreecommitdiff
path: root/tools/setup_Debian.sh
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-20 02:56:17 +0000
committerGerrit Code Review <review@openstack.org>2017-01-20 02:56:17 +0000
commitdc063ce776ee26234de4af8b2ecefab748245541 (patch)
tree6da9faeb5ad25e29f4c90805b1ebcc725b56f8f9 /tools/setup_Debian.sh
parenta0b14cfebf26c475490530c23a1360bc2bd41949 (diff)
parent85d218ec447b180f0dc7b2a7270f8c798938df79 (diff)
downloadkolla-dc063ce776ee26234de4af8b2ecefab748245541.tar.gz
kolla-dc063ce776ee26234de4af8b2ecefab748245541.zip
Merge "Fix the gate failure"
Diffstat (limited to 'tools/setup_Debian.sh')
-rwxr-xr-xtools/setup_Debian.sh6
1 files changed, 3 insertions, 3 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