From a7d06d738079b3c0a481527ec286a507b27ed5a9 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 18 Feb 2020 08:29:57 -0600 Subject: [PATCH 1/2] drivers/rackspace: default to Ubuntu 18.04 image The existing image ID has been deprecated by Rackspace resulting in the default not working anymore. At the same time Ubuntu 16.04 is reaching its end of life status in just another year. The 18.04 kernel also contains a number of good improvements for Docker so switch to 18.04 by default. Signed-off-by: Doug Goldstein --- drivers/rackspace/rackspace.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/rackspace/rackspace.go b/drivers/rackspace/rackspace.go index 5e6bb49720..844db7c1a4 100644 --- a/drivers/rackspace/rackspace.go +++ b/drivers/rackspace/rackspace.go @@ -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", @@ -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" { From dcaffca2ae17aacebbcc5f7365f68eabbe2c2c77 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 18 Feb 2020 08:31:45 -0600 Subject: [PATCH 2/2] drivers/rackspace: allow start/stop actions The start/stop actions work fine on Rackspace's cloud. There's no reason to restrict them. Signed-off-by: Doug Goldstein --- drivers/rackspace/client.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/rackspace/client.go b/drivers/rackspace/client.go index b73263fd06..841420d736 100644 --- a/drivers/rackspace/client.go +++ b/drivers/rackspace/client.go @@ -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)