From 5cc75907490d1a9cacaa711fa67c7b0b37404a2f Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Fri, 30 Jun 2023 14:13:21 +0200 Subject: [PATCH] cli: allow creating OpenStack cluster without experimental environment variable --- cli/internal/cloudcmd/create.go | 4 ---- cli/internal/cloudcmd/create_test.go | 2 -- 2 files changed, 6 deletions(-) diff --git a/cli/internal/cloudcmd/create.go b/cli/internal/cloudcmd/create.go index 399f8d971..a069cacdd 100644 --- a/cli/internal/cloudcmd/create.go +++ b/cli/internal/cloudcmd/create.go @@ -313,10 +313,6 @@ func normalizeAzureURIs(vars terraform.AzureClusterVariables) terraform.AzureClu } func (c *Creator) createOpenStack(ctx context.Context, cl terraformClient, opts CreateOptions) (idFile clusterid.File, retErr error) { - // TODO(malt3): Remove this once OpenStack is supported. - if os.Getenv("CONSTELLATION_OPENSTACK_DEV") != "1" { - return clusterid.File{}, errors.New("OpenStack isn't supported yet") - } if _, hasOSAuthURL := os.LookupEnv("OS_AUTH_URL"); !hasOSAuthURL && opts.Config.Provider.OpenStack.Cloud == "" { return clusterid.File{}, errors.New( "neither environment variable OS_AUTH_URL nor cloud name for \"clouds.yaml\" is set. OpenStack authentication requires a set of " + diff --git a/cli/internal/cloudcmd/create_test.go b/cli/internal/cloudcmd/create_test.go index eded26230..f9c9c7072 100644 --- a/cli/internal/cloudcmd/create_test.go +++ b/cli/internal/cloudcmd/create_test.go @@ -21,8 +21,6 @@ import ( ) func TestCreator(t *testing.T) { - // TODO(malt3): remove once OpenStack is fully supported. - t.Setenv("CONSTELLATION_OPENSTACK_DEV", "1") failOnNonAMD64 := (runtime.GOARCH != "amd64") || (runtime.GOOS != "linux") ip := "192.0.2.1" someErr := errors.New("failed")