Merge pull request #955 from ggiamarchi/keystone_v3_domains
Keystone v3 domains
This commit is contained in:
commit
ec80e4419b
|
@ -399,6 +399,8 @@ func (c *GenericClient) Authenticate(d *Driver) error {
|
|||
log.WithFields(log.Fields{
|
||||
"AuthUrl": d.AuthUrl,
|
||||
"Insecure": d.Insecure,
|
||||
"DomainID": d.DomainID,
|
||||
"DomainName": d.DomainName,
|
||||
"Username": d.Username,
|
||||
"TenantName": d.TenantName,
|
||||
"TenantID": d.TenantId,
|
||||
|
@ -406,6 +408,8 @@ func (c *GenericClient) Authenticate(d *Driver) error {
|
|||
|
||||
opts := gophercloud.AuthOptions{
|
||||
IdentityEndpoint: d.AuthUrl,
|
||||
DomainID: d.DomainID,
|
||||
DomainName: d.DomainName,
|
||||
Username: d.Username,
|
||||
Password: d.Password,
|
||||
TenantName: d.TenantName,
|
||||
|
|
|
@ -19,6 +19,8 @@ import (
|
|||
type Driver struct {
|
||||
AuthUrl string
|
||||
Insecure bool
|
||||
DomainID string
|
||||
DomainName string
|
||||
Username string
|
||||
Password string
|
||||
TenantName string
|
||||
|
@ -68,6 +70,18 @@ func GetCreateFlags() []cli.Flag {
|
|||
Name: "openstack-insecure",
|
||||
Usage: "Disable TLS credential checking.",
|
||||
},
|
||||
cli.StringFlag{
|
||||
EnvVar: "OS_DOMAIN_ID",
|
||||
Name: "openstack-domain-id",
|
||||
Usage: "OpenStack domain ID (identity v3 only)",
|
||||
Value: "",
|
||||
},
|
||||
cli.StringFlag{
|
||||
EnvVar: "OS_DOMAIN_NAME",
|
||||
Name: "openstack-domain-name",
|
||||
Usage: "OpenStack domain name (identity v3 only)",
|
||||
Value: "",
|
||||
},
|
||||
cli.StringFlag{
|
||||
EnvVar: "OS_USERNAME",
|
||||
Name: "openstack-username",
|
||||
|
@ -225,6 +239,8 @@ func (d *Driver) DriverName() string {
|
|||
func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
|
||||
d.AuthUrl = flags.String("openstack-auth-url")
|
||||
d.Insecure = flags.Bool("openstack-insecure")
|
||||
d.DomainID = flags.String("openstack-domain-id")
|
||||
d.DomainName = flags.String("openstack-domain-name")
|
||||
d.Username = flags.String("openstack-username")
|
||||
d.Password = flags.String("openstack-password")
|
||||
d.TenantName = flags.String("openstack-tenant-name")
|
||||
|
|
Loading…
Reference in New Issue