docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OpenStack: Allow to provide both tenant name and id 

When sourcing an OpenStack rc file, both variables OS_TENANT_ID
and OS_TENANT_NAME are defined.

Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
This commit is contained in:
Vincent Giersch 2014-12-11 10:29:25 +01:00 committed by Guillaume Giamarchi
parent f6b0c81996
commit 59260f2716
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/openstack/openstack.go
View File

@ -333,7 +333,6 @@ func (d *Driver) GetSSHCommand(args ...string) (*exec.Cmd, error) {
const (
errorMandatoryEnvOrOption string = "%s must be specified either using the environment variable %s or the CLI option %s"
errorMandatoryOption string = "%s must be specified using the CLI option %s"
errorExclusiveOptions string = "Either %s or %s must be specified, not both"
errorMandatoryTenantNameOrId string = "Tenant id or name must be provided either using one of the environment variables OS_TENANT_ID and OS_TENANT_NAME or one of the CLI options --openstack-tenant-id and --openstack-tenant-name"
errorWrongEndpointType string = "Endpoint type must be 'publicURL', 'adminURL' or 'internalURL'"
)
@ -351,9 +350,6 @@ func (d *Driver) checkConfig() error {
if d.TenantName == "" && d.TenantId == "" {
return fmt.Errorf(errorMandatoryTenantNameOrId)
}
if d.TenantName != "" && d.TenantId != "" {
return fmt.Errorf(errorExclusiveOptions, "tenant id", "tenant name")
}
if d.FlavorId == "" {
return fmt.Errorf(errorMandatoryOption, "Flavor id", "--openstack-flavor-id")
}