diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-25 18:22:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-25 18:22:04 +0000 |
| commit | e4cc27ff4278a62981da435ad7d7dcee6158b1f2 (patch) | |
| tree | deafecad79c79bd8c0d945cda9181640a665d838 | |
| parent | 0e2a627ea8b2ada8ccb88c27eac7def17d824618 (diff) | |
| parent | a97714c07a479c82fe3c5f05bbdf5743ddfc73b5 (diff) | |
| download | kolla-e4cc27ff4278a62981da435ad7d7dcee6158b1f2.tar.gz kolla-e4cc27ff4278a62981da435ad7d7dcee6158b1f2.zip | |
Merge "Vagrant bootstrap incorrectly adds quotes to kolla-build.conf"
| -rw-r--r-- | vagrant/bootstrap.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 2e56151b0..889942922 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -81,7 +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,^[# ]*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 |