From b09bb9eb37968f47f929980acda887f61ffaa3fb Mon Sep 17 00:00:00 2001 From: "Derek Lemon (delemon)" Date: Thu, 21 Mar 2019 08:02:16 -0600 Subject: [PATCH] Openstack environment escaping --- nodeup/pkg/bootstrap/install.go | 4 ++-- pkg/model/bootstrapscript.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nodeup/pkg/bootstrap/install.go b/nodeup/pkg/bootstrap/install.go index fd4928e495..f5d77848b5 100644 --- a/nodeup/pkg/bootstrap/install.go +++ b/nodeup/pkg/bootstrap/install.go @@ -151,11 +151,11 @@ func (i *Installation) buildSystemdJob() *nodetasks.Service { "OS_AUTH_URL", "OS_REGION_NAME", } { - buffer.WriteString("\"") + buffer.WriteString("'") buffer.WriteString(envVar) buffer.WriteString("=") buffer.WriteString(os.Getenv(envVar)) - buffer.WriteString("\" ") + buffer.WriteString("' ") } } diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index d1c046cf9a..d642f8523b 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -83,7 +83,7 @@ func (b *BootstrapScript) buildEnvironmentVariables(cluster *kops.Cluster) (map[ "OS_AUTH_URL", "OS_REGION_NAME", } { - env[envVar] = os.Getenv(envVar) + env[envVar] = fmt.Sprintf("'%s'", os.Getenv(envVar)) } }