Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,009 Commits 1 Branch 72 Tags
fc49adbcdfa1c6985fda170f5cac4fe009dee85d
Commit Graph

347 Commits

Author SHA1 Message Date
Vincent Bernat 44be16c49f drivers: don't let the driver wait for SSH/Docker 
Waiting for SSH to start or Docker to be available is a step done
directly in the framework (in libmachine). There is no need for the
driver to do that.

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
Fabio Rapposelli 25583edbb3 Update VMware Fusion and vSphere driver to run boot2docker 1.6.0 
- Update custom ISO to docker 1.6.0.
- Shared folder support for VMware Fusion.
- Updated bats test for Fusion.

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-04-20 10:34:13 -07:00
John Fieber 6ab04a0b51 Extract a wrench accidentally left inside the engine 
Signed-off-by: John Fieber <jrf@ursamaris.org>
 2015-04-17 12:24:58 -07:00
John Fieber fdaa783597 Virtualbox: move NAT port allocation to machine boot 
The host side ssh NAT port was being chosen by the OS
when the VM was crafted in the `Create` method.
There was no accounting for some other process taking
over the port while the VM is shutoff.

This moves the port provisioning to VM start.
On first start, the OS will supply the port.  Subsequent
starts, we see if we can re-use the port, falling back
to delegating the selection to the OS.

Signed-off-by: John Fieber <jrf@ursamaris.org>
 2015-04-17 11:49:18 -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
Evan Hazlett 460cc02ea5 ec2: update spot instance message 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-14 17:03:38 -04:00
Qicong Chen 9b577aabb6 Supports #226 
Signed-off-by: Qicong Chen <qicongchen92@gmail.com>

Fix logging problem

Signed-off-by: Qicong Chen <qicongchen92@gmail.com>
 2015-04-14 14:48:27 -04:00
Evan Hazlett 2a93207bd9 Merge pull request #955 from ggiamarchi/keystone_v3_domains 
Keystone v3 domains
 2015-04-10 16:57:06 -04:00
Evan Hazlett 7b70d83579 Merge pull request #901 from djfarrelly/filter-create-help-cmd 
Filter create command flags by driver
 2015-04-10 16:20:49 -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
Vincent Bernat bbe1bf42c8 fakedriver: remove useless methods 
Since the refactor done in #756, some methods have been removed from the
driver interface. Remove those methods from `fakedriver`:

 - `StartDocker()`
 - `StopDocker()`
 - `GetDockerConfigDir()`
 - `GetSSHCommand()`

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-04-10 16:55:45 +02:00
Guillaume Giamarchi edbdbd7bbf Support Keystone v3 domains 
Fix #679

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2015-04-09 17:40:21 +02:00
wlan0 ee941e979b make ssh username configurable for ec2 
Signed-off-by: wlan0 <sidharthamn@gmail.com>
 2015-04-07 18:00:06 -07:00
Dan Farrelly 71140cf47c Filter create command flags by driver 
Signed-off-by: Dan Farrelly <daniel.j.farrelly@gmail.com>
 2015-04-05 15:18:47 -04:00
Evan Hazlett d0d9aa2d47 Merge pull request #952 from ehazlett/do-fix-waitssh 
digitalocean: remove unneeded wait for ssh
 2015-04-03 16:27:43 -04:00
Evan Hazlett 51a86f7846 digitalocean: remove unneeded wait for ssh 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-03 11:24:21 -04:00
Evan Hazlett b9f191cedd Merge pull request #706 from ehazlett/rackspace-flavor-env-var 
rackspace: enable env var for flavor id
 2015-04-03 10:39:45 -04:00
Evan Hazlett 10e8c446a7 rackspace: update env var and docs for flavor-id 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-02 10:01:42 -04:00
Evan Hazlett 45c8673f13 Merge pull request #920 from nathanleclaire/provisioner_upgrade 
Provisioner upgrade
 2015-03-31 12:12:51 -04:00
Evan Hazlett cfeffa530f Merge pull request #828 from ehazlett/vbox-tcp-port 
vbox: fix race with getting a tcp port
 2015-03-31 11:52:25 -04:00
Nathan LeClaire 9b5f395c60 Implement upgrade functionality for boot2docker 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-30 16:18:38 -07:00
Evan Hazlett f010a7bb80 Merge pull request #896 from ggiamarchi/dead_code 
Remove dead code
 2015-03-30 11:38:48 -04:00
Tom Barlow 97cd23f2e5 Added VIRTUALBOX_MEMORY_SIZE and VIRTUALBOX_DISK_SIZE env vars 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:48 +00:00
Guillaume Giamarchi fb1362ea05 Remove dead code 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2015-03-27 19:25:11 +01:00
Paul Biggar dde614dbb0 Adds virtualbox-cpu-count - fixes #819 
Signed-off-by: Paul Biggar <paul.biggar@gmail.com>
 2015-03-25 20:06:22 -07:00
Evan Hazlett f524029d48 virtualbox: add maximum retry for allocating a tcp port 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-25 18:10:54 -07:00
Ke Zhu f92f57cd4d keep global b2d iso cache when using custom b2d iso 
Signed-off-by: Ke Zhu <kzhu@us.ibm.com>
 2015-03-24 15:21:15 -07:00
Evan Hazlett bde6ad3fac fixed b2d url bug with fusion / vsphere 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-24 15:21:15 -07:00
Evan Hazlett 2151492dec fix regression for custom b2d url paths 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-24 15:21:15 -07:00
Evan Hazlett d68cbe4164 Merge pull request #780 from smashwilson/set-useragent 
Set the User-Agent for OpenStack and Rackspace drivers
 2015-03-24 05:17:45 -07:00
Paul Czarkowski 5b366b5573 quick fix of typo in openstack driver 
Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
 2015-03-23 18:31:34 -05:00
Ash Wilson cab014cd28 Prepend a string to the User-Agent. 
For both OpenStack and Rackspace drivers.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
 2015-03-23 11:42:24 -04:00
Nathan LeClaire 263c802d34 Fix missing test files 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 17:05:27 -07:00
Nathan LeClaire d189baf36c Move fakedriver to its own module for reuse 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 16:48:47 -07:00
Nathan LeClaire and Simon Thulborn 49feb33457 Implement majority of provisioning changes 
Signed-off-by: Simon Thulborn <simon+github@thulborn.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 16:30:46 -07:00
Evan Hazlett 4e10204b8e vbox: fix race with getting a tcp port 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-19 15:30:02 -04:00
Evan Hazlett 344c7d771a Merge pull request #770 from ehazlett/x509-check-ip-san 
certs: x509 check ip san
 2015-03-17 14:04:58 -04:00
Evan Hazlett da3da50897 DO: updated to new driver spec; updated integration tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-17 11:08:20 -04:00
Evan Hazlett 5403171328 ec2: fix bug where ip address was not updated upon restart 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-17 11:08:20 -04: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
Evan Hazlett 645bf8ab90 amazonec2: add SSHUser to driver 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-11 22:04:52 -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
Evan Hazlett f0cbb81ee6 Merge pull request #761 from hairyhenderson/softlayer-no-hardcode-image-759 
Honouring the `--softlayer-image` flag
 2015-03-11 10:50:14 -04:00