From b0ae95b6c290f8076df23d40742cb16ca3f7973c Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Mon, 14 Sep 2020 19:32:22 +0200 Subject: [PATCH] Don't write application credentials to cloud config unless external CCM is enabled --- nodeup/pkg/model/cloudconfig.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nodeup/pkg/model/cloudconfig.go b/nodeup/pkg/model/cloudconfig.go index 23da22ba7df34..2d065eb9b82d2 100644 --- a/nodeup/pkg/model/cloudconfig.go +++ b/nodeup/pkg/model/cloudconfig.go @@ -92,8 +92,16 @@ func (b *CloudConfigBuilder) Build(c *fi.ModelBuilderContext) error { fmt.Sprintf("tenant-name=\"%s\"", tenantName), fmt.Sprintf("domain-name=\"%s\"", os.Getenv("OS_DOMAIN_NAME")), fmt.Sprintf("domain-id=\"%s\"", os.Getenv("OS_DOMAIN_ID")), - fmt.Sprintf("application-credential-id=\"%s\"", os.Getenv("OS_APPLICATION_CREDENTIAL_ID")), - fmt.Sprintf("application-credential-secret=\"%s\"", os.Getenv("OS_APPLICATION_CREDENTIAL_SECRET")), + ) + if b.Cluster.Spec.ExternalCloudControllerManager != nil { + lines = append(lines, + fmt.Sprintf("application-credential-id=\"%s\"", os.Getenv("OS_APPLICATION_CREDENTIAL_ID")), + fmt.Sprintf("application-credential-secret=\"%s\"", os.Getenv("OS_APPLICATION_CREDENTIAL_SECRET")), + ) + + } + + lines = append(lines, "", )