Merge pull request docker-archive-public#3753 from exoscale/exoscale/update-default

nathanleclaire · web-flow · commit 83b2e02dd028 · 2016-10-04T11:01:16.000-07:00
[Exoscale] Modify exoscale default driver values
diff --git a/docs/drivers/exoscale.md b/docs/drivers/exoscale.md
@@ -1,7 +1,7 @@
 <!--[metadata]>
 +++
-title = "exoscale"
-description = "exoscale driver for machine"
+title = "Exoscale"
+description = "Exoscale driver for machine"
 keywords = ["machine, exoscale, driver"]
 [menu.main]
 parent="smn_machine_drivers"
@@ -10,7 +10,7 @@ parent="smn_machine_drivers"
 
 # Exoscale
 
-Create machines on [exoscale](https://www.exoscale.ch/).
+Create machines on [Exoscale](https://www.exoscale.ch/).
 
 Get your API key and API secret key from [API details](https://portal.exoscale.ch/account/api) and pass them to `machine create` with the `--exoscale-api-key` and `--exoscale-api-secret-key` options.
 
@@ -25,7 +25,7 @@ Get your API key and API secret key from [API details](https://portal.exoscale.c
 -   `--exoscale-api-secret-key`: **required** Your API secret key.
 -   `--exoscale-instance-profile`: Instance profile.
 -   `--exoscale-disk-size`: Disk size for the host in GB (10, 50, 100, 200, 400).
--   `--exoscale-image`: Image template (e.g. ubuntu-14.04, ubuntu-15.10).
+-   `--exoscale-image`: Image template (e.g. ubuntu-16.04, ubuntu-15.10).
 -   `--exoscale-security-group`: Security group. It will be created if it doesn't exist.
 -   `--exoscale-availability-zone`: Exoscale availability zone.
 -   `--exoscale-ssh-user`: SSH username, which must match the default SSH user for the used image.
@@ -45,9 +45,9 @@ There is a limit to the number of docker machines that an anti-affinity group ca
 | **`--exoscale-api-secret-key`** | `EXOSCALE_API_SECRET`        | -                                 |
 | `--exoscale-instance-profile`   | `EXOSCALE_INSTANCE_PROFILE`  | `small`                           |
 | `--exoscale-disk-size`          | `EXOSCALE_DISK_SIZE`         | `50`                              |
-| `--exoscale-image`              | `EXOSCALE_IMAGE`             | `ubuntu-15.10`                    |
+| `--exoscale-image`              | `EXOSCALE_IMAGE`             | `ubuntu-16.04`                    |
 | `--exoscale-security-group`     | `EXOSCALE_SECURITY_GROUP`    | `docker-machine`                  |
-| `--exoscale-availability-zone`  | `EXOSCALE_AVAILABILITY_ZONE` | `ch-gva-2`                        |
+| `--exoscale-availability-zone`  | `EXOSCALE_AVAILABILITY_ZONE` | `ch-dk-2`                         |
 | `--exoscale-ssh-user`           | `EXOSCALE_SSH_USER`          | `ubuntu`                          |
 | `--exoscale-userdata`           | `EXOSCALE_USERDATA`          | -                                 |
 | `--exoscale-affinity-group`     | `EXOSCALE_AFFINITY_GROUP`    | `docker-machine`                  |
diff --git a/drivers/exoscale/exoscale.go b/drivers/exoscale/exoscale.go
@@ -36,8 +36,8 @@ type Driver struct {
 const (
 	defaultInstanceProfile  = "small"
 	defaultDiskSize         = 50
-	defaultImage            = "ubuntu-15.10"
-	defaultAvailabilityZone = "ch-gva-2"
+	defaultImage            = "ubuntu-16.04"
+	defaultAvailabilityZone = "ch-dk-2"
 	defaultSSHUser          = "ubuntu"
 )
 
