diff --git a/docs/drivers/rackspace.md b/docs/drivers/rackspace.md index a02958dc37..3e802d5186 100644 --- a/docs/drivers/rackspace.md +++ b/docs/drivers/rackspace.md @@ -18,13 +18,13 @@ Options: - `--rackspace-api-key`: **required** Rackspace API key. - `--rackspace-region`: **required** Rackspace region name. - `--rackspace-endpoint-type`: Rackspace endpoint type (`adminURL`, `internalURL` or the default `publicURL`). -- `--rackspace-image-id`: Rackspace image ID. Default: Ubuntu 14.10 (Utopic Unicorn) (PVHVM). +- `--rackspace-image-id`: Rackspace image ID. Default: Ubuntu 15.10 (Wily Werewolf) (PVHVM). - `--rackspace-flavor-id`: Rackspace flavor ID. Default: General Purpose 1GB. - `--rackspace-ssh-user`: SSH user for the newly booted machine. - `--rackspace-ssh-port`: SSH port for the newly booted machine. - `--rackspace-docker-install`: Set if Docker has to be installed on the machine. -The Rackspace driver will use `598a4282-f14b-4e50-af4c-b3e52749d9f9` (Ubuntu 14.04 LTS) by default. +The Rackspace driver will use `59a3fadd-93e7-4674-886a-64883e17115f` (Ubuntu 15.10) by default. Environment variables and default values: @@ -34,7 +34,7 @@ Environment variables and default values: | **`--rackspace-api-key`** | `OS_API_KEY` | - | | **`--rackspace-region`** | `OS_REGION_NAME` | - | | `--rackspace-endpoint-type` | `OS_ENDPOINT_TYPE` | `publicURL` | -| `--rackspace-image-id` | - | `598a4282-f14b-4e50-af4c-b3e52749d9f9` | +| `--rackspace-image-id` | - | `59a3fadd-93e7-4674-886a-64883e17115f` | | `--rackspace-flavor-id` | `OS_FLAVOR_ID` | `general1-1` | | `--rackspace-ssh-user` | - | `root` | | `--rackspace-ssh-port` | - | `22` | diff --git a/drivers/rackspace/rackspace.go b/drivers/rackspace/rackspace.go index f1c0dd6102..0fc75f6862 100644 --- a/drivers/rackspace/rackspace.go +++ b/drivers/rackspace/rackspace.go @@ -136,10 +136,10 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { } if d.ImageId == "" { - // Default to the Ubuntu 14.04 image. + // Default to the Ubuntu 15.10 image. // This is done here, rather than in the option registration, to keep the default value // from making "machine create --help" ugly. - d.ImageId = "598a4282-f14b-4e50-af4c-b3e52749d9f9" + d.ImageId = "59a3fadd-93e7-4674-886a-64883e17115f" } if d.EndpointType != "publicURL" && d.EndpointType != "adminURL" && d.EndpointType != "internalURL" {