diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-18 13:03:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-18 13:03:04 +0000 |
| commit | 9e64644dc00dc881cc49385474cbace15de6e9d3 (patch) | |
| tree | d356219981142a61328904d4a62713f7ddd32e54 | |
| parent | 53efa6251f916545ea652f52dcd45eb919a1351e (diff) | |
| parent | 557e116e40fe79878963ef41a4436ae786a440c9 (diff) | |
| download | kolla-9e64644dc00dc881cc49385474cbace15de6e9d3.tar.gz kolla-9e64644dc00dc881cc49385474cbace15de6e9d3.zip | |
Merge "Set namespace to point to local registry"
| -rw-r--r-- | vagrant/bootstrap.sh | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index ca3e75939..ef76b25ee 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -81,6 +81,7 @@ EOF function configure_kolla { # Use local docker registry + sed -i -r "s,^[# ]*namespace.+$,namespace = \"${REGISTRY}/lokolla\"," /etc/kolla/kolla-build.conf sed -i -r "s,^[# ]*docker_registry:.+$,docker_registry: \"${REGISTRY}\"," /etc/kolla/globals.yml sed -i -r "s,^[# ]*docker_namespace:.+$,docker_namespace: \"lokolla\"," /etc/kolla/globals.yml sed -i -r "s,^[# ]*docker_insecure_registry:.+$,docker_insecure_registry: \"True\"," /etc/kolla/globals.yml @@ -124,18 +125,8 @@ export OS_PASSWORD=password export OS_TENANT_NAME=admin export OS_VOLUME_API_VERSION=2 EOF + chown vagrant: ~vagrant/openrc - # Quick&dirty helper script to push images to the local registry's lokolla - # namespace. - cat > ~vagrant/tag-and-push.sh <<EOF -for image in \$(docker images|awk '/^kollaglue/ {print \$1}'); do - docker tag \$image ${REGISTRY}/lokolla/\${image#kollaglue/}:latest - docker push ${REGISTRY}/lokolla/\${image#kollaglue/}:latest -done -EOF - chmod +x ~vagrant/tag-and-push.sh - - chown vagrant: ~vagrant/openrc ~vagrant/tag-and-push.sh # Launch a local registry (and mirror) to speed up pulling images. # 0.9.1 is actually the _latest_ tag. |