aboutsummaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2016-01-05 11:29:54 +0900
committerMartin André <m.andre@redhat.com>2016-01-05 11:29:54 +0900
commit3aeec10b88bfa47d690580b1f78e88a475a858a9 (patch)
tree6631c7e32da78fe145e13c8c6b668d53c76f2d55 /dev
parent58daa10ae30cc750e5f8f3f5e512f444d12aa5f7 (diff)
downloadkolla-3aeec10b88bfa47d690580b1f78e88a475a858a9.tar.gz
kolla-3aeec10b88bfa47d690580b1f78e88a475a858a9.zip
Be more specific in regex used in sed
We want to change *only* the desired option. Change-Id: Ic67ba474569f6bf7d74bd710364f26be0f0363eb Close-Bug: #1531046
Diffstat (limited to 'dev')
-rw-r--r--dev/vagrant/bootstrap.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh
index 8315b76f3..b33d294f0 100644
--- a/dev/vagrant/bootstrap.sh
+++ b/dev/vagrant/bootstrap.sh
@@ -69,8 +69,8 @@ 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,^[# ]*push.+$,push = True," /etc/kolla/kolla-build.conf
+ sed -i -r "s,^[# ]*namespace *=.+$,namespace = ${REGISTRY}/lokolla," /etc/kolla/kolla-build.conf
+ sed -i -r "s,^[# ]*push *=.+$,push = True," /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