Skip to content

[occm] Support keystone token for openstack auth #2964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −0
Open

[occm] Support keystone token for openstack auth #2964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .../openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ The options in `Global` section are used for openstack-cloud-controller-manager
The secret of an application credential to authenticate with.
* `tls-insecure`
If set to `true`, then the server’s certificate will not be verified. Default is `false`.
* `token`
Keystone token.

### Networking

Expand Down
3 changes: 3 additions & 0 deletions pkg/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ type AuthOpts struct {
EndpointType gophercloud.Availability `gcfg:"os-endpoint-type" mapstructure:"os-endpoint-type" name:"os-endpointType" value:"optional"`
CAFile string `gcfg:"ca-file" mapstructure:"ca-file" name:"os-certAuthorityPath" value:"optional"`
TLSInsecure string `gcfg:"tls-insecure" mapstructure:"tls-insecure" name:"os-TLSInsecure" value:"optional" matches:"^true|false$"`
Token string `name:"os-token" value:"optional"`

// TLS client auth
CertFile string `gcfg:"cert-file" mapstructure:"cert-file" name:"os-clientCertPath" value:"optional" dependsOn:"os-clientKeyPath"`
Expand Down Expand Up @@ -150,6 +151,7 @@ func (authOpts AuthOpts) ToAuthOptions() gophercloud.AuthOptions {
ApplicationCredentialID: authOpts.ApplicationCredentialID,
ApplicationCredentialName: authOpts.ApplicationCredentialName,
ApplicationCredentialSecret: authOpts.ApplicationCredentialSecret,
Token: authOpts.Token,
},
}

Expand Down Expand Up @@ -231,6 +233,7 @@ func ReadClouds(authOpts *AuthOpts) error {
authOpts.ApplicationCredentialID = replaceEmpty(authOpts.ApplicationCredentialID, cloud.AuthInfo.ApplicationCredentialID)
authOpts.ApplicationCredentialName = replaceEmpty(authOpts.ApplicationCredentialName, cloud.AuthInfo.ApplicationCredentialName)
authOpts.ApplicationCredentialSecret = replaceEmpty(authOpts.ApplicationCredentialSecret, cloud.AuthInfo.ApplicationCredentialSecret)
authOpts.Token = replaceEmpty(authOpts.Token, cloud.AuthInfo.Token)

return nil
}
Expand Down