Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-07-21 06:21:43 -04:00
Code Issues Projects Releases Packages Wiki Activity

cli: allow creating OpenStack cluster without experimental environment variable

Browse source
This commit is contained in:
Malte Poll 2023-06-30 14:13:21 +02:00
parent ac1927263a
commit 5cc7590749
2 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cli/internal/cloudcmd/create.go
View file

@ -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) { 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 == "" { if _, hasOSAuthURL := os.LookupEnv("OS_AUTH_URL"); !hasOSAuthURL && opts.Config.Provider.OpenStack.Cloud == "" {
return clusterid.File{}, errors.New( 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 " + "neither environment variable OS_AUTH_URL nor cloud name for \"clouds.yaml\" is set. OpenStack authentication requires a set of " +

2
cli/internal/cloudcmd/create_test.go
View file

@ -21,8 +21,6 @@ import (
) )
func TestCreator(t *testing.T) { 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") failOnNonAMD64 := (runtime.GOARCH != "amd64") || (runtime.GOOS != "linux")
ip := "192.0.2.1" ip := "192.0.2.1"
someErr := errors.New("failed") someErr := errors.New("failed")