Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

OpenStack: update gophercloud package and add new auth options #4755

Closed
wants to merge 4 commits into from
Closed

OpenStack: update gophercloud package and add new auth options #4755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5811f5
Use go modules as a dependency manager
kayrus Sep 24, 2019
11f2dd2
Update gophercloud dependencies
kayrus Sep 24, 2019
621b2a1
Support identity v3
kayrus Sep 24, 2019
b8bb147
Remove node on Create error
kayrus Sep 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
486 changes: 0 additions & 486 deletions Gopkg.lock
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions Gopkg.toml
View file
Open in desktop

This file was deleted.

111 changes: 39 additions & 72 deletions drivers/openstack/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,23 @@ import (
"github.com/docker/machine/libmachine/log"
"github.com/docker/machine/libmachine/mcnutils"
"github.com/docker/machine/libmachine/version"
"github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/openstack"
compute_ips "github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip"
"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs"
"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop"
"github.com/rackspace/gophercloud/openstack/compute/v2/flavors"
"github.com/rackspace/gophercloud/openstack/compute/v2/images"
"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
"github.com/rackspace/gophercloud/openstack/identity/v2/tenants"
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
"github.com/rackspace/gophercloud/openstack/networking/v2/networks"
"github.com/rackspace/gophercloud/openstack/networking/v2/ports"
"github.com/rackspace/gophercloud/pagination"
"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/openstack"
compute_ips "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/startstop"
"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
"github.com/gophercloud/gophercloud/openstack/compute/v2/images"
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
"github.com/gophercloud/gophercloud/pagination"
)

type Client interface {
Authenticate(d *Driver) error
InitComputeClient(d *Driver) error
InitIdentityClient(d *Driver) error
InitNetworkClient(d *Driver) error

CreateInstance(d *Driver) (string, error)
Expand All @@ -50,13 +48,11 @@ type Client interface {
GetFloatingIPs(d *Driver) ([]FloatingIP, error)
GetFloatingIPPoolID(d *Driver) (string, error)
GetInstancePortID(d *Driver) (string, error)
GetTenantID(d *Driver) (string, error)
}

type GenericClient struct {
Provider *gophercloud.ProviderClient
Compute *gophercloud.ServiceClient
Identity *gophercloud.ServiceClient
Network *gophercloud.ServiceClient
}

Expand All @@ -68,7 +64,7 @@ func (c *GenericClient) CreateInstance(d *Driver) (string, error) {
UserData: d.UserData,
SecurityGroups: d.SecurityGroups,
AvailabilityZone: d.AvailabilityZone,
ConfigDrive: d.ConfigDrive,
ConfigDrive: &d.ConfigDrive,
Metadata: d.GetMetadata(),
}
if d.NetworkId != "" {
Expand Down Expand Up @@ -136,7 +132,7 @@ func (c *GenericClient) StopInstance(d *Driver) error {
}

func (c *GenericClient) RestartInstance(d *Driver) error {
if result := servers.Reboot(c.Compute, d.MachineId, servers.SoftReboot); result.Err != nil {
if result := servers.Reboot(c.Compute, d.MachineId, servers.RebootOpts{Type: servers.SoftReboot}); result.Err != nil {
return result.Err
}
return nil
Expand Down Expand Up @@ -283,29 +279,6 @@ func (c *GenericClient) GetImageID(d *Driver) (string, error) {
return imageID, err
}

func (c *GenericClient) GetTenantID(d *Driver) (string, error) {
pager := tenants.List(c.Identity, nil)
tenantId := ""

err := pager.EachPage(func(page pagination.Page) (bool, error) {
tenantList, err := tenants.ExtractTenants(page)
if err != nil {
return false, err
}

for _, i := range tenantList {
if i.Name == d.TenantName {
tenantId = i.ID
return false, nil
}
}

return true, nil
})

return tenantId, err
}

func (c *GenericClient) GetPublicKey(keyPairName string) ([]byte, error) {
kp, err := keypairs.Get(c.Compute, keyPairName).Extract()
if err != nil {
Expand Down Expand Up @@ -358,7 +331,7 @@ func (c *GenericClient) assignNovaFloatingIP(d *Driver, floatingIP *FloatingIP)
floatingIP.Ip = f.IP
floatingIP.Pool = f.Pool
}
return compute_ips.Associate(c.Compute, d.MachineId, floatingIP.Ip).Err
return compute_ips.AssociateInstance(c.Compute, d.MachineId, compute_ips.AssociateOpts{FloatingIP: floatingIP.Ip}).Err
}

func (c *GenericClient) assignNeutronFloatingIP(d *Driver, floatingIP *FloatingIP) error {
Expand All @@ -381,7 +354,7 @@ func (c *GenericClient) assignNeutronFloatingIP(d *Driver, floatingIP *FloatingI
return nil
}
_, err = floatingips.Update(c.Network, floatingIP.Id, floatingips.UpdateOpts{
PortID: portID,
PortID: &portID,
}).Extract()
if err != nil {
return err
Expand Down Expand Up @@ -492,16 +465,6 @@ func (c *GenericClient) InitComputeClient(d *Driver) error {
return nil
}

func (c *GenericClient) InitIdentityClient(d *Driver) error {
if c.Identity != nil {
return nil
}

identity := openstack.NewIdentityV2(c.Provider)
c.Identity = identity
return nil
}

func (c *GenericClient) InitNetworkClient(d *Driver) error {
if c.Network != nil {
return nil
Expand Down Expand Up @@ -534,28 +497,32 @@ func (c *GenericClient) Authenticate(d *Driver) error {
}

log.Debug("Authenticating...", map[string]interface{}{
"AuthUrl": d.AuthUrl,
"Insecure": d.Insecure,
"CaCert": d.CaCert,
"DomainID": d.DomainID,
"DomainName": d.DomainName,
"Username": d.Username,
"TenantName": d.TenantName,
"TenantID": d.TenantId,
"AuthUrl": d.AuthUrl,
"Insecure": d.Insecure,
"CaCert": d.CaCert,
"DomainId": d.DomainId,
"DomainName": d.DomainName,
"UserId": d.UserId,
"Username": d.Username,
"TenantName": d.TenantName,
"TenantID": d.TenantId,
"TenantDomainName": d.TenantDomainName,
"TenantDomainID": d.TenantDomainId,
"UserDomainName": d.UserDomainName,
"UserDomainID": d.UserDomainId,
"ApplicationCredentialId": d.ApplicationCredentialId,
"ApplicationCredentialName": d.ApplicationCredentialName,
})

opts := gophercloud.AuthOptions{
IdentityEndpoint: d.AuthUrl,
DomainID: d.DomainID,
DomainName: d.DomainName,
Username: d.Username,
Password: d.Password,
TenantName: d.TenantName,
TenantID: d.TenantId,
AllowReauth: true,
ao, err := d.parseAuthConfig()
if err != nil {
return err
}

provider, err := openstack.NewClient(opts.IdentityEndpoint)
// Persistent service, so we need to be able to renew tokens.
ao.AllowReauth = true

provider, err := openstack.NewClient(d.AuthUrl)
if err != nil {
return err
}
Expand All @@ -569,7 +536,7 @@ func (c *GenericClient) Authenticate(d *Driver) error {
return err
}

err = openstack.Authenticate(c.Provider, opts)
err = openstack.Authenticate(c.Provider, *ao)
if err != nil {
return err
}
Expand Down
Loading