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

Rackspace driver fix #4786

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rackspace driver fix #4786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7d06d7
drivers/rackspace: default to Ubuntu 18.04 image
cardoe Feb 18, 2020
dcaffca
drivers/rackspace: allow start/stop actions
cardoe Feb 18, 2020
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
10 changes: 0 additions & 10 deletions drivers/rackspace/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,6 @@ func (c *Client) Authenticate(d *openstack.Driver) error {
return nil
}

// StartInstance is unfortunately not supported on Rackspace at this time.
func (c *Client) StartInstance(d *openstack.Driver) error {
return unsupportedOpErr("start")
}

// StopInstance is unfortunately not support on Rackspace at this time.
func (c *Client) StopInstance(d *openstack.Driver) error {
return unsupportedOpErr("stop")
}

// GetInstanceIPAddresses can be short-circuited with the server's AccessIPv4Addr on Rackspace.
func (c *Client) GetInstanceIPAddresses(d *openstack.Driver) ([]openstack.IPAddress, error) {
server, err := c.GetServerDetail(d)
Expand Down
6 changes: 3 additions & 3 deletions drivers/rackspace/rackspace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
mcnflag.StringFlag{
EnvVar: "OS_IMAGE_ID",
Name: "rackspace-image-id",
Usage: "Rackspace image ID. Default: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)",
Usage: "Rackspace image ID. Default: Ubuntu 18.04 LTS (Bionic Beaver) (Cloud)",
},
mcnflag.StringFlag{
EnvVar: "OS_FLAVOR_ID",
Expand Down Expand Up @@ -144,10 +144,10 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
}

if d.ImageId == "" {
// Default to the Ubuntu 16.04 image.
// Default to the Ubuntu 18.04 image.
// This is done here, rather than in the option registration, to keep the default value
// from making "machine create --help" ugly.
d.ImageId = "821ba5f4-712d-4ec8-9c65-a3fa4bc500f9"
d.ImageId = "498bfa38-d288-4e37-b975-a4acb77f8557"
}

if d.EndpointType != "publicURL" && d.EndpointType != "adminURL" && d.EndpointType != "internalURL" {
Expand Down