aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-26 17:17:10 +0000
committerGerrit Code Review <review@openstack.org>2017-05-26 17:17:11 +0000
commit7a9160f3f3eb394ead52ebd1861329db1d8a6868 (patch)
tree610309849f7d9abd14323bef3955ab2f9b4b4301 /contrib
parent330a367da24996149b7cffce0037154527502adc (diff)
parent64fa91063f32492896f125ef464b80a39a7461c4 (diff)
downloadkolla-7a9160f3f3eb394ead52ebd1861329db1d8a6868.tar.gz
kolla-7a9160f3f3eb394ead52ebd1861329db1d8a6868.zip
Merge "Fix sed replacement command in Ubuntu's install_docker"
Diffstat (limited to 'contrib')
-rw-r--r--contrib/dev/vagrant/bootstrap.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh
index 9bc1fb627..a142fb874 100644
--- a/contrib/dev/vagrant/bootstrap.sh
+++ b/contrib/dev/vagrant/bootstrap.sh
@@ -117,7 +117,7 @@ EOF
echo "deb https://apt.dockerproject.org/repo ubuntu-wily main" > /etc/apt/sources.list.d/docker.list
apt-get update
apt-get -y install docker-engine
- sed -i -r "s,(ExecStart)=(.+),\1=/usr/bin/docker daemon --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}|" /lib/systemd/system/docker.service
+ sed -i -r "s|(ExecStart)=(.+)|\1=/usr/bin/docker daemon --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}|" /lib/systemd/system/docker.service
else
echo "Unsupported Distro: $DISTRO" 1>&2
exit 1