31b1eb0875
gce: fix for instance not being refreshed on create
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:54:08 -04:00
4358113b41
Merge pull request #1025 from jfieber/vboxnat
...
Virtualbox: move NAT port allocation to machine boot
2015-04-29 09:25:38 -04:00
5fe9adf881
Update GCE imageName to v20150316
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-04-29 05:34:15 +09:00
f42177983f
Remove stray sleep()
...
This is just a bit of development debris.
Signed-off-by: John Fieber <jrf@ursamaris.org>
2015-04-27 16:58:57 -07:00
cafad9bb1d
Merge remote-tracking branch 'origin/master' into vboxnat
...
# Conflicts:
# drivers/virtualbox/virtualbox.go
2015-04-27 10:01:43 -07:00
7443980c26
Support "--google-disk-type" flag for google driver
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-04-26 04:38:18 +09:00
567e19b8ad
unbreak the darwin build, last rebase added some old variable names again
...
Signed-off-by: Sascha Hanse <shanse@gmail.com>
2015-04-24 21:17:41 +02:00
57c70ef0f1
Merge pull request #956 from knarz/golint_vmware
...
clean up the vmware drivers
2015-04-24 09:38:09 -07:00
6e0aecb2ee
clean up the vmware drivers
...
Signed-off-by: Sascha Hanse <shanse@gmail.com>
forgot gofmt
Signed-off-by: Sascha Hanse <shanse@gmail.com>
2015-04-23 20:12:07 +02:00
e9491d22dc
b2d import: move debug logging to debug
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:03 -04:00
8f66be1bc2
b2d import: split key/val assignment from switch
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:03 -04:00
33eab99e58
import cpu and memory settings when importing b2d vm
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
a01322fa77
fixed ssh generation issue
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
7a4e16e082
virtualbox: add ability to import b2d instances
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
576951e03a
wip: b2d import
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
709b0a84e3
Add SSH client
...
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-04-21 15:37:09 +01:00
191564564e
Merge pull request #995 from exoscale/fix/dont-wait-in-drivers
...
Don't let drivers wait for SSH/Docker/State
2015-04-21 07:31:12 -07:00
f64eb09d1c
Merge pull request #1034 from frapposelli/fusion-shared-folders
...
Update VMware Fusion and vSphere driver to run boot2docker 1.6.0
2015-04-21 07:22:15 -07:00
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
fbb8898914
drivers/google: don't wait for SSH to be ready
...
Waiting for SSH is done in libmachine. There are some additional steps
after waiting for SSH but none of them seem to require SSH to be ready
to be executed.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
3440ba64fa
drivers/vcloudair: don't test connectivity
...
VMWare VCloudAir driver is the only one taking an extra step to test
connectivity after machine creation. If this is a desirable step, it
should be done for all drivers in libmachine directly.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
6f1155c2e7
drivers/openstack: don't let the driver wait for state
...
OpenStack driver waits for the machine to reach the expected state. This
is already done in libmachine for most instances of this pattern.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
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
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
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
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
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
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
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
878e37cda6
softlayer: enable local disk in hostspec
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-15 11:03:39 -04:00
460cc02ea5
ec2: update spot instance message
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-14 17:03:38 -04:00
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
2a93207bd9
Merge pull request #955 from ggiamarchi/keystone_v3_domains
...
Keystone v3 domains
2015-04-10 16:57:06 -04:00
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
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
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
edbdbd7bbf
Support Keystone v3 domains
...
Fix #679
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-04-09 17:40:21 +02:00
ee941e979b
make ssh username configurable for ec2
...
Signed-off-by: wlan0 <sidharthamn@gmail.com>
2015-04-07 18:00:06 -07:00
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
d0d9aa2d47
Merge pull request #952 from ehazlett/do-fix-waitssh
...
digitalocean: remove unneeded wait for ssh
2015-04-03 16:27:43 -04:00
51a86f7846
digitalocean: remove unneeded wait for ssh
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-03 11:24:21 -04:00
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
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
45c8673f13
Merge pull request #920 from nathanleclaire/provisioner_upgrade
...
Provisioner upgrade
2015-03-31 12:12:51 -04:00
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
9b5f395c60
Implement upgrade functionality for boot2docker
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-30 16:18:38 -07:00
f010a7bb80
Merge pull request #896 from ggiamarchi/dead_code
...
Remove dead code
2015-03-30 11:38:48 -04:00
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
fb1362ea05
Remove dead code
...
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-03-27 19:25:11 +01:00
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