From 3aeec10b88bfa47d690580b1f78e88a475a858a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Tue, 5 Jan 2016 11:29:54 +0900
Subject: [PATCH] Be more specific in regex used in sed
We want to change *only* the desired option.
Change-Id: Ic67ba474569f6bf7d74bd710364f26be0f0363eb
Close-Bug: #1531046
---
dev/vagrant/bootstrap.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh
index 8315b76f3e..b33d294f05 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