diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-08 10:00:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-08 10:00:14 +0000 |
| commit | 8ee78949ffb785cfcaab541e048432f38eedb4ba (patch) | |
| tree | 35ff8535a62255e70b157828d1649f18d426ff57 | |
| parent | bfa2ea6c1c2a0340d1bfe6346770110336e3aa69 (diff) | |
| parent | c7297e04c15eb3dd7fbf0825c51932452c8c1275 (diff) | |
| download | kolla-8ee78949ffb785cfcaab541e048432f38eedb4ba.tar.gz kolla-8ee78949ffb785cfcaab541e048432f38eedb4ba.zip | |
Merge "Update Vagrant's Ubuntu box provisioning script"
| -rw-r--r-- | dev/vagrant/ubuntu-bootstrap.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dev/vagrant/ubuntu-bootstrap.sh b/dev/vagrant/ubuntu-bootstrap.sh index 04b9591d0..2f2565030 100644 --- a/dev/vagrant/ubuntu-bootstrap.sh +++ b/dev/vagrant/ubuntu-bootstrap.sh @@ -25,10 +25,13 @@ EOF install_docker() { echo "Installing Docker" apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D - echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list + echo "deb https://apt.dockerproject.org/repo ubuntu-vivid main" > /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y docker-engine=1.8.2* - sed -i -r "s,^[# ]*DOCKER_OPTS=.+$,DOCKER_OPTS=\"--insecure-registry ${REGISTRY}:${REGISTRY_PORT}\"," /etc/default/docker + sed -i -r "s,(ExecStart)=(.+),\1=/usr/bin/docker daemon -H fd:// -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --insecure-registry ${REGISTRY}:${REGISTRY_PORT}," /lib/systemd/system/docker.service + systemctl daemon-reload + systemctl enable docker + systemctl restart docker } install_python_deps() { @@ -55,8 +58,10 @@ create_registry() { -e MIRROR_SOURCE=https://registry-1.docker.io \ -e MIRROR_SOURCE_INDEX=https://index.docker.io \ -e STORAGE_PATH=/var/lib/registry \ + -e GUNICORN_OPTS=[--preload] \ + -e SEARCH_BACKEND=sqlalchemy \ -v /data/host/registry-storage:/var/lib/registry \ - registry + registry:0.9.1 } configure_kolla() { |