mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-02-22 07:50:04 -05:00
openstack: prepare for normal users (#2899)
* image: disable serial console autologin on OpenStack * cli: remove requirement for CONSTELLATION_OPENSTACK_DEV env var
This commit is contained in:
parent
5b73d48bdd
commit
dba835bdf4
@ -27,7 +27,6 @@ import (
|
||||
)
|
||||
|
||||
func TestApplier(t *testing.T) {
|
||||
t.Setenv("CONSTELLATION_OPENSTACK_DEV", "1")
|
||||
failOnNonAMD64 := (runtime.GOARCH != "amd64") || (runtime.GOOS != "linux")
|
||||
ip := "192.0.2.1"
|
||||
configWithProvider := func(provider cloudprovider.Provider) *config.Config {
|
||||
|
@ -234,9 +234,6 @@ func gcpTerraformIAMVars(conf *config.Config, oldVars terraform.GCPIAMVariables)
|
||||
// openStackTerraformVars provides variables required to execute the Terraform scripts.
|
||||
// It should be the only place to declare the OpenStack variables.
|
||||
func openStackTerraformVars(conf *config.Config, imageRef string) (*terraform.OpenStackClusterVariables, error) {
|
||||
if os.Getenv("CONSTELLATION_OPENSTACK_DEV") != "1" {
|
||||
return nil, errors.New("Constellation must be fine-tuned to your OpenStack deployment. Please create an issue or contact Edgeless Systems at https://edgeless.systems/contact/")
|
||||
}
|
||||
if _, hasOSAuthURL := os.LookupEnv("OS_AUTH_URL"); !hasOSAuthURL && conf.Provider.OpenStack.Cloud == "" {
|
||||
return nil, errors.New(
|
||||
"neither environment variable OS_AUTH_URL nor cloud name for \"clouds.yaml\" is set. OpenStack authentication requires a set of " +
|
||||
|
@ -73,7 +73,6 @@ csp_settings = {
|
||||
},
|
||||
},
|
||||
"openstack": {
|
||||
"autologin": True,
|
||||
"kernel_command_line": "console=tty0 console=ttyS0",
|
||||
"kernel_command_line_dict": {
|
||||
"console": "tty0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user