diff options
| author | Juan J. Martinez <jjm@usebox.net> | 2017-06-02 13:51:37 +0100 |
|---|---|---|
| committer | Juan J. MartÃnez <jmartinez@cray.com> | 2017-06-12 07:33:40 +0000 |
| commit | 056ecc55ea0ef2f2942a710d6c5cb754da52fad9 (patch) | |
| tree | ee15474d92a05ae08ca8c21f3cdd656d10c46610 /contrib/dev/vagrant/bootstrap.sh | |
| parent | 53a4f234697b7ad01a64ddb8c885ca5fbb878562 (diff) | |
| download | kolla-ansible-056ecc55ea0ef2f2942a710d6c5cb754da52fad9.tar.gz kolla-ansible-056ecc55ea0ef2f2942a710d6c5cb754da52fad9.zip | |
Update Vagrant dev environment
- Updated Ubuntu image to use 16.04.
- VirtualBox provider to use centos/7 image + vagrant-vbguest plugin.
- Improved docs so it is clear that vagrant-vbguest plugin is only
required with VirtualBox.
- Clarified comment and made it independent of the release.
- Refactored the kolla and kolla-ansible paths to be based on the
username used by Vagrant, that can change depending on the image.
Change-Id: I23d84dcc3297c43eb12eff9c443d282281fc6c82
Diffstat (limited to 'contrib/dev/vagrant/bootstrap.sh')
| -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..8be008f78 100644 --- a/contrib/dev/vagrant/bootstrap.sh +++ b/contrib/dev/vagrant/bootstrap.sh @@ -115,7 +115,7 @@ EOF usermod -aG docker vagrant elif is_ubuntu; then apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D - echo "deb https://apt.dockerproject.org/repo ubuntu-wily main" > /etc/apt/sources.list.d/docker.list + echo "deb https://apt.dockerproject.org/repo ubuntu-xenial 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 |