From 2596b70636c4967e2b67720334ae387a66dee2fb Mon Sep 17 00:00:00 2001 From: ioito Date: Wed, 5 Jun 2019 16:53:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8DOpenStack=E4=B8=BA=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC,=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/openstackcli/main.go | 4 ++-- pkg/util/openstack/provider/provider.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/openstackcli/main.go b/cmd/openstackcli/main.go index 751ab6c5d4..4f0b20ebb4 100644 --- a/cmd/openstackcli/main.go +++ b/cmd/openstackcli/main.go @@ -34,8 +34,8 @@ type BaseOptions struct { Password string `help:"Password" default:"$OPENSTACK_PASSWORD"` Project string `help:"Project" default:"$OPENSTACK_PROJECT"` EndpointType string `help:"Project" default:"$OPENSTACK_ENDPOINT_TYPE|internal"` - DomainName string `help:"Domain of user" default:"$OPENSTACK_DOMAIN_NAME"` - ProjectDomain string `help:"Domain of project" default:"$OPENSTACK_PROJECT_DOMAIN"` + DomainName string `help:"Domain of user" default:"$OPENSTACK_DOMAIN_NAME|Default"` + ProjectDomain string `help:"Domain of project" default:"$OPENSTACK_PROJECT_DOMAIN|Default"` RegionID string `help:"RegionId" default:"$OPENSTACK_REGION_ID"` SUBCOMMAND string `help:"openstackcli subcommand" subcommand:"true"` } diff --git a/pkg/util/openstack/provider/provider.go b/pkg/util/openstack/provider/provider.go index 2d7a0070bf..d017c198db 100644 --- a/pkg/util/openstack/provider/provider.go +++ b/pkg/util/openstack/provider/provider.go @@ -112,9 +112,9 @@ func (self *SOpenStackProviderFactory) GetProvider(providerId, providerName, url if len(accountInfo) < 2 { return nil, fmt.Errorf("Missing username or project name %s", account) } - project, username, endpointType, domainName, projectDomainName := accountInfo[0], accountInfo[1], "internal", "", "" + project, username, endpointType, domainName, projectDomainName := accountInfo[0], accountInfo[1], "internal", "Default", "Default" if len(accountInfo) == 3 { - domainName = accountInfo[2] + domainName, projectDomainName = accountInfo[2], accountInfo[2] } client, err := openstack.NewOpenStackClient(providerId, providerName, url, username, password, project, endpointType, domainName, projectDomainName, false) if err != nil {