x
/
docker-machine-openstack
Code Issues Proposed changes

Revert "Rackspace/Openstack - Add/enhance --*-net-* create switches." 

This reverts commit 07cadc68a53c818bf83806e854bbe6ac1ddeda66.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire 2016-02-26 11:09:34 -08:00
parent feadca3ddf
commit 1ffea5ceed
2 changed files with 52 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/openstack/client.go
View File

@ -41,8 +41,7 @@ type Client interface {
GetPublicKey(keyPairName string) ([]byte, error) GetPublicKey(keyPairName string) ([]byte, error)
CreateKeyPair(d *Driver, name string, publicKey string) error CreateKeyPair(d *Driver, name string, publicKey string) error
DeleteKeyPair(d *Driver, name string) error DeleteKeyPair(d *Driver, name string) error
GetNetworkIDs(d *Driver) ([]string, error) GetNetworkID(d *Driver) (string, error)
GetNetworkID(d *Driver, networkName string) (string, error)
GetFlavorID(d *Driver) (string, error) GetFlavorID(d *Driver) (string, error)
GetImageID(d *Driver) (string, error) GetImageID(d *Driver) (string, error)
AssignFloatingIP(d *Driver, floatingIP *FloatingIP) error AssignFloatingIP(d *Driver, floatingIP *FloatingIP) error
@ -67,12 +66,12 @@ func (c *GenericClient) CreateInstance(d *Driver) (string, error) {
SecurityGroups: d.SecurityGroups, SecurityGroups: d.SecurityGroups,
AvailabilityZone: d.AvailabilityZone, AvailabilityZone: d.AvailabilityZone,
} }
if len(d.NetworkIds) > 0 { if d.NetworkId != "" {
networks := make([]servers.Network, len(d.NetworkIds)) serverOpts.Networks = []servers.Network{
for i, networkId := range d.NetworkIds { {
networks[i] = servers.Network{UUID: networkId} UUID: d.NetworkId,
},
} }
serverOpts.Networks = networks
} }
log.Info("Creating machine...") log.Info("Creating machine...")
@ -200,23 +199,15 @@ func (c *GenericClient) GetInstanceIPAddresses(d *Driver) ([]IPAddress, error) {
return addresses, nil return addresses, nil
} }
func (c *GenericClient) GetNetworkIDs(d *Driver) ([]string, error) { func (c *GenericClient) GetNetworkID(d *Driver) (string, error) {
networkIDs := make([]string, len(d.NetworkNames)) return c.getNetworkID(d, d.NetworkName)
for i, networkName := range d.NetworkNames {
id, err := c.GetNetworkID(d, networkName)
if err != nil {
return nil, err
}
networkIDs[i] = id
}
return networkIDs, nil
} }
func (c *GenericClient) GetFloatingIPPoolID(d *Driver) (string, error) { func (c *GenericClient) GetFloatingIPPoolID(d *Driver) (string, error) {
return c.GetNetworkID(d, d.FloatingIPPool) return c.getNetworkID(d, d.FloatingIpPool)
} }
func (c *GenericClient) GetNetworkID(d *Driver, networkName string) (string, error) { func (c *GenericClient) getNetworkID(d *Driver, networkName string) (string, error) {
opts := networks.ListOpts{Name: networkName} opts := networks.ListOpts{Name: networkName}
pager := networks.List(c.Network, opts) pager := networks.List(c.Network, opts)
networkID := "" networkID := ""
@ -354,7 +345,7 @@ func (c *GenericClient) AssignFloatingIP(d *Driver, floatingIP *FloatingIP) erro
func (c *GenericClient) assignNovaFloatingIP(d *Driver, floatingIP *FloatingIP) error { func (c *GenericClient) assignNovaFloatingIP(d *Driver, floatingIP *FloatingIP) error {
if floatingIP.Ip == "" { if floatingIP.Ip == "" {
f, err := compute_ips.Create(c.Compute, compute_ips.CreateOpts{ f, err := compute_ips.Create(c.Compute, compute_ips.CreateOpts{
Pool: d.FloatingIPPool, Pool: d.FloatingIpPool,
}).Extract() }).Extract()
if err != nil { if err != nil {
return err return err
@ -372,7 +363,7 @@ func (c *GenericClient) assignNeutronFloatingIP(d *Driver, floatingIP *FloatingI
} }
if floatingIP.Id == "" { if floatingIP.Id == "" {
f, err := floatingips.Create(c.Network, floatingips.CreateOpts{ f, err := floatingips.Create(c.Network, floatingips.CreateOpts{
FloatingNetworkID: d.FloatingIPPoolId, FloatingNetworkID: d.FloatingIpPoolId,
PortID: portID, PortID: portID,
}).Extract() }).Extract()
if err != nil { if err != nil {
@ -409,7 +400,7 @@ func (c *GenericClient) getNovaNetworkFloatingIPs(d *Driver) ([]FloatingIP, erro
ipListing, err := compute_ips.ExtractFloatingIPs(page) ipListing, err := compute_ips.ExtractFloatingIPs(page)
for _, ip := range ipListing { for _, ip := range ipListing {
if ip.InstanceID == "" && ip.Pool == d.FloatingIPPool { if ip.InstanceID == "" && ip.Pool == d.FloatingIpPool {
ips = append(ips, FloatingIP{ ips = append(ips, FloatingIP{
Id: ip.ID, Id: ip.ID,
Ip: ip.IP, Ip: ip.IP,
@ -424,11 +415,11 @@ func (c *GenericClient) getNovaNetworkFloatingIPs(d *Driver) ([]FloatingIP, erro
func (c *GenericClient) getNeutronNetworkFloatingIPs(d *Driver) ([]FloatingIP, error) { func (c *GenericClient) getNeutronNetworkFloatingIPs(d *Driver) ([]FloatingIP, error) {
log.Debug("Listing floating IPs", map[string]string{ log.Debug("Listing floating IPs", map[string]string{
"FloatingNetworkId": d.FloatingIPPoolId, "FloatingNetworkId": d.FloatingIpPoolId,
"TenantID": d.TenantId, "TenantID": d.TenantId,
}) })
pager := floatingips.List(c.Network, floatingips.ListOpts{ pager := floatingips.List(c.Network, floatingips.ListOpts{
FloatingNetworkID: d.FloatingIPPoolId, FloatingNetworkID: d.FloatingIpPoolId,
TenantID: d.TenantId, TenantID: d.TenantId,
}) })
@ -458,7 +449,7 @@ func (c *GenericClient) getNeutronNetworkFloatingIPs(d *Driver) ([]FloatingIP, e
func (c *GenericClient) GetInstancePortID(d *Driver) (string, error) { func (c *GenericClient) GetInstancePortID(d *Driver) (string, error) {
pager := ports.List(c.Network, ports.ListOpts{ pager := ports.List(c.Network, ports.ListOpts{
DeviceID: d.MachineId, DeviceID: d.MachineId,
NetworkID: d.NetworkIds[0], NetworkID: d.NetworkId,
}) })
var portID string var portID string

76
drivers/openstack/openstack.go
View File

@ -35,13 +35,13 @@ type Driver struct {
ImageName string ImageName string
ImageId string ImageId string
KeyPairName string KeyPairName string
NetworkNames []string NetworkName string
NetworkIds []string NetworkId string
PrivateKeyFile string PrivateKeyFile string
SecurityGroups []string SecurityGroups []string
FloatingIPPool string FloatingIpPool string
ComputeNetwork bool ComputeNetwork bool
FloatingIPPoolId string FloatingIpPoolId string
IpVersion int IpVersion int
client Client client Client
} }
@ -149,22 +149,22 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
Usage: "OpenStack keypair to use to SSH to the instance", Usage: "OpenStack keypair to use to SSH to the instance",
Value: "", Value: "",
}, },
mcnflag.StringFlag{
EnvVar: "OS_NETWORK_ID",
Name: "openstack-net-id",
Usage: "OpenStack network id the machine will be connected on",
Value: "",
},
mcnflag.StringFlag{ mcnflag.StringFlag{
EnvVar: "OS_PRIVATE_KEY_FILE", EnvVar: "OS_PRIVATE_KEY_FILE",
Name: "openstack-private-key-file", Name: "openstack-private-key-file",
Usage: "Private keyfile to use for SSH (absolute path)", Usage: "Private keyfile to use for SSH (absolute path)",
Value: "", Value: "",
}, },
mcnflag.StringFlag{
EnvVar: "OS_NETWORK_ID",
Name: "openstack-net-id",
Usage: "OpenStack comma separated networks id the machine will be connected on",
Value: "",
},
mcnflag.StringFlag{ mcnflag.StringFlag{
EnvVar: "OS_NETWORK_NAME", EnvVar: "OS_NETWORK_NAME",
Name: "openstack-net-name", Name: "openstack-net-name",
Usage: "OpenStack comma separated network names the machine will be connected on", Usage: "OpenStack network name the machine will be connected on",
Value: "", Value: "",
}, },
mcnflag.StringFlag{ mcnflag.StringFlag{
@ -181,7 +181,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
mcnflag.StringFlag{ mcnflag.StringFlag{
EnvVar: "OS_FLOATINGIP_POOL", EnvVar: "OS_FLOATINGIP_POOL",
Name: "openstack-floatingip-pool", Name: "openstack-floatingip-pool",
Usage: "OpenStack floating IP pool to get an IP from to assign to the instance (first network only)", Usage: "OpenStack floating IP pool to get an IP from to assign to the instance",
Value: "", Value: "",
}, },
mcnflag.IntFlag{ mcnflag.IntFlag{
@ -258,16 +258,12 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.FlavorName = flags.String("openstack-flavor-name") d.FlavorName = flags.String("openstack-flavor-name")
d.ImageId = flags.String("openstack-image-id") d.ImageId = flags.String("openstack-image-id")
d.ImageName = flags.String("openstack-image-name") d.ImageName = flags.String("openstack-image-name")
if flags.String("openstack-net-id") != "" { d.NetworkId = flags.String("openstack-net-id")
d.NetworkIds = strings.Split(flags.String("openstack-net-id"), ",") d.NetworkName = flags.String("openstack-net-name")
}
if flags.String("openstack-net-name") != "" {
d.NetworkNames = strings.Split(flags.String("openstack-net-name"), ",")
}
if flags.String("openstack-sec-groups") != "" { if flags.String("openstack-sec-groups") != "" {
d.SecurityGroups = strings.Split(flags.String("openstack-sec-groups"), ",") d.SecurityGroups = strings.Split(flags.String("openstack-sec-groups"), ",")
} }
d.FloatingIPPool = flags.String("openstack-floatingip-pool") d.FloatingIpPool = flags.String("openstack-floatingip-pool")
d.IpVersion = flags.Int("openstack-ip-version") d.IpVersion = flags.Int("openstack-ip-version")
d.ComputeNetwork = flags.Bool("openstack-nova-network") d.ComputeNetwork = flags.Bool("openstack-nova-network")
d.SSHUser = flags.String("openstack-ssh-user") d.SSHUser = flags.String("openstack-ssh-user")
@ -307,7 +303,7 @@ func (d *Driver) GetIP() (string, error) {
} }
addressType := Fixed addressType := Fixed
if d.FloatingIPPool != "" { if d.FloatingIpPool != "" {
addressType = Floating addressType = Floating
} }
@ -380,7 +376,7 @@ func (d *Driver) Create() error {
if err := d.waitForInstanceActive(); err != nil { if err := d.waitForInstanceActive(); err != nil {
return err return err
} }
if d.FloatingIPPool != "" { if d.FloatingIpPool != "" {
if err := d.assignFloatingIP(); err != nil { if err := d.assignFloatingIP(); err != nil {
return err return err
} }
@ -477,8 +473,8 @@ func (d *Driver) checkConfig() error {
return fmt.Errorf(errorExclusiveOptions, "Image name", "Image id") return fmt.Errorf(errorExclusiveOptions, "Image name", "Image id")
} }
if len(d.NetworkNames) > 0 && len(d.NetworkIds) > 0 { if d.NetworkName != "" && d.NetworkId != "" {
return fmt.Errorf(errorExclusiveOptions, "Network names", "Network ids") return fmt.Errorf(errorExclusiveOptions, "Network name", "Network id")
} }
if d.EndpointType != "" && (d.EndpointType != "publicURL" && d.EndpointType != "adminURL" && d.EndpointType != "internalURL") { if d.EndpointType != "" && (d.EndpointType != "publicURL" && d.EndpointType != "adminURL" && d.EndpointType != "internalURL") {
return fmt.Errorf(errorWrongEndpointType) return fmt.Errorf(errorWrongEndpointType)
@ -490,26 +486,26 @@ func (d *Driver) checkConfig() error {
} }
func (d *Driver) resolveIds() error { func (d *Driver) resolveIds() error {
if len(d.NetworkNames) > 0 && !d.ComputeNetwork { if d.NetworkName != "" && !d.ComputeNetwork {
if err := d.initNetwork(); err != nil { if err := d.initNetwork(); err != nil {
return err return err
} }
networkIds, err := d.client.GetNetworkIDs(d)
networkID, err := d.client.GetNetworkID(d)
if err != nil { if err != nil {
return err return err
} }
if len(networkIds) == 0 { if networkID == "" {
return fmt.Errorf(errorUnknownNetworkName, strings.Join(d.NetworkNames, ",")) // TODO specific name return fmt.Errorf(errorUnknownNetworkName, d.NetworkName)
} }
d.NetworkIds = networkIds d.NetworkId = networkID
for i, networkName := range d.NetworkNames { log.Debug("Found network id using its name", map[string]string{
log.Debug("Found network id using its name", map[string]string{ "Name": d.NetworkName,
"Name": networkName, "ID": d.NetworkId,
"ID": d.NetworkIds[i], })
})
}
} }
if d.FlavorName != "" { if d.FlavorName != "" {
@ -554,7 +550,7 @@ func (d *Driver) resolveIds() error {
}) })
} }
if d.FloatingIPPool != "" && !d.ComputeNetwork { if d.FloatingIpPool != "" && !d.ComputeNetwork {
if err := d.initNetwork(); err != nil { if err := d.initNetwork(); err != nil {
return err return err
} }
@ -565,13 +561,13 @@ func (d *Driver) resolveIds() error {
} }
if f == "" { if f == "" {
return fmt.Errorf(errorUnknownNetworkName, d.FloatingIPPool) return fmt.Errorf(errorUnknownNetworkName, d.FloatingIpPool)
} }
d.FloatingIPPoolId = f d.FloatingIpPoolId = f
log.Debug("Found floating IP pool id using its name", map[string]string{ log.Debug("Found floating IP pool id using its name", map[string]string{
"Name": d.FloatingIPPool, "Name": d.FloatingIpPool,
"ID": d.FloatingIPPoolId, "ID": d.FloatingIpPoolId,
}) })
} }
@ -712,7 +708,7 @@ func (d *Driver) assignFloatingIP() error {
log.Debugf("Looking for an available floating IP", map[string]string{ log.Debugf("Looking for an available floating IP", map[string]string{
"MachineId": d.MachineId, "MachineId": d.MachineId,
"Pool": d.FloatingIPPool, "Pool": d.FloatingIpPool,
}) })
for _, ip := range ips { for _, ip := range ips {