Commit Graph

23 Commits

Author SHA1 Message Date
Vincent Bernat 9c71e647ed drivers/softlayer: don't let the driver wait for SSH
Installation of curl is handled directly by libmachine provisioning, so
there is no need to do it and hence wait for SSH to be ready.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
Evan Hazlett 4047c97679 Merge pull request #1009 from hairyhenderson/softlayer-remove-sshkey-on-delete-765
Deleting Machine-generated SSH key from SoftLayer when host is canceled.
2015-04-20 14:00:24 -07:00
Rob Smart a625106876 Softlayer driver, correctly store provisioned VM IP address
Fix for Docker Machine gets stuck on IBM Softlayer #915
The ip address of the provisioned VM was not being stored in the driver IPAddress variable, this variable
was being used to check if the VM ssh service was up. However as the variable was a blank string the actual address being checked defaulted
to localhost:22, as a result the installation steps on the VM only worked if the user was running an ssh daemon on the machine they were using docker-machine from.

Signed-off-by: Rob Smart <smartrob@uk.ibm.com>
2015-04-16 13:21:09 +01:00
Dave Henderson 64a844071d Deleting Machine-generated SSH key from SoftLayer when host is canceled.
All the other drivers seem to do this, so I can't imagine this is a bad
idea ;)

Fixes #765

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-15 20:37:24 -04:00
Evan Hazlett 878e37cda6
softlayer: enable local disk in hostspec
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-15 11:03:39 -04:00
Vincent Bernat 91d12d06ec drivers: remove unneeded `GetDockerConfigDir()` and `dockerConfigDir` const
This method is not part of the driver interface anymore.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-10 17:03:11 +02:00
Dave Henderson 2da08635e8 Refactoring to move closures into methods
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-03-16 20:53:18 -04:00
Dave Henderson 30e0ca00b6 Wait for any activeTransactions to finish during Create
This adds an additional wait phase to make sure any active Transactions
are completed before Create tries to SSH in to the new host. This is
sometimes necessary because SSH can become available before SoftLayer
is fully done setting up the host and strange things can happen...

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-14 21:33:57 -04:00
Evan Hazlett 92bb9e5e20
merged origin/master
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-11 23:02:22 -04:00
Evan Hazlett bc6b66c122
drivers: specify defaults if values are missing; i.e. config updates
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-11 22:59:28 -04:00
Dave Henderson cdf4038721 Setting `DEBIAN_FRONTEND` to `noninteractive` in SoftLayer
Fixes #763

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-11 13:19:40 -04:00
Evan Hazlett b68f1146e2 Merge branch 'origin/master' into driver-refactor 2015-03-11 11:16:39 -04:00
Dave Henderson 5dd5c79358 Honouring the `--softlayer-image` flag
Even though Machine only really supports Ubuntu, we still shouldn't
hard-code the softlayer-image to `UBUNTU_LATEST` ;)

Fixes #759

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-10 09:59:40 -04:00
Evan Hazlett 4b034fd1b6
softlayer: update with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:58:52 -04:00
Evan Hazlett 96b660d5b7
softlayer: fix provisioning bug where curl is not available
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 18:31:41 -04:00
Evan Hazlett 54f36078f4 do not show debug for docker install by default; refactor install out of drivers
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-23 17:14:32 -05:00
Evan Hazlett 3a3ef6f45e add discovery to machine config; show swarm membership
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett a949e12b6e store swarm config in driver; vendor Godeps; generate swarm token
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Jamie Furness d1ccb16a5c Need to sudo to install the package as well as perform update.
Signed-off-by: Jamie Furness <jamie@jamierf.co.uk>
2015-02-11 15:35:38 +00:00
Evan Hazlett 57810b298d This adds a method to the Driver: PreCreateCheck. This can be used
where you want to run some prerequisite checks before attempting to
create
the machine.  In the case of EC2, this is a check for an existing
keypair.  This can be used in the other drivers in the future as well.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-26 11:27:12 -05:00
Evan Hazlett 75f79ed25e use ubuntu 14.04 for remaining drivers
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-23 17:08:29 -05:00
Brian Goff b1d1c80a76 Use TLS stuff instead
Thanks @ehazlett

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-19 12:32:32 -05:00
Brian Goff 8d8c6fe71d Add softlayer driver
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-19 12:29:56 -05:00