mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-07 10:06:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix TLS issue with OpenStack auth (Designate)

Browse Source
This commit is contained in:
Ben Hundley 2018-09-25 14:47:50 -05:00
parent 6d2b83cbf2
commit 381b7667c4
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
provider/designate.go
View File

@ -123,16 +123,7 @@ func createDesignateServiceClient() (*gophercloud.ServiceClient, error) {
return nil, err return nil, err
} }
log.Infof("Using OpenStack Keystone at %s", opts.IdentityEndpoint) log.Infof("Using OpenStack Keystone at %s", opts.IdentityEndpoint)
authProvider, err := openstack.AuthenticatedClient(opts) authProvider, err := openstack.NewClient(opts.IdentityEndpoint)
if err != nil {
return nil, err
}
eo := gophercloud.EndpointOpts{
Region: os.Getenv("OS_REGION_NAME"),
}
client, err := openstack.NewDNSV2(authProvider, eo)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -154,7 +145,20 @@ func createDesignateServiceClient() (*gophercloud.ServiceClient, error) {
ExpectContinueTimeout: 1 * time.Second, ExpectContinueTimeout: 1 * time.Second,
TLSClientConfig: tlsConfig, TLSClientConfig: tlsConfig,
} }
client.ProviderClient.HTTPClient.Transport = transport authProvider.HTTPClient.Transport = transport
if err = openstack.Authenticate(authProvider, opts); err != nil {
return nil, err
}
eo := gophercloud.EndpointOpts{
Region: os.Getenv("OS_REGION_NAME"),
}
client, err := openstack.NewDNSV2(authProvider, eo)
if err != nil {
return nil, err
}
log.Infof("Found OpenStack Designate service at %s", client.Endpoint) log.Infof("Found OpenStack Designate service at %s", client.Endpoint)
return client, nil return client, nil
} }