diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-12 09:00:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-12 09:00:08 +0000 |
| commit | c272b8ec167918fbdb4ddc3b1f7dc4c7919b9ecd (patch) | |
| tree | 38f003ca20958c7f06d1ccc0869ecd84c7738bc8 /contrib | |
| parent | 53a4f234697b7ad01a64ddb8c885ca5fbb878562 (diff) | |
| parent | a1d362583f3392ecdbcd23d408df18ccd2aa6af7 (diff) | |
| download | kolla-ansible-c272b8ec167918fbdb4ddc3b1f7dc4c7919b9ecd.tar.gz kolla-ansible-c272b8ec167918fbdb4ddc3b1f7dc4c7919b9ecd.zip | |
Merge "Fix sed replacement command in Ubuntu's install_docker"
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dev/vagrant/bootstrap.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh index 0719e5b1a..5711adfaa 100644 --- a/contrib/dev/vagrant/bootstrap.sh +++ b/contrib/dev/vagrant/bootstrap.sh @@ -118,7 +118,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 |