66114abb0d
Improved handling of boot delays until VM comes online
...
Signed-off-by: Martin Schygulla <martin.schygulla@gmail.com>
2015-07-07 04:18:49 +02:00
e7e68149e5
Enhanced driver for VMWare Fusion to support configuration data for cloud-init.
...
The userdata is injected into the VM as an ISO via the cdrom.
Signed-off-by: Martin Schygulla <martin.schygulla@gmail.com>
2015-07-06 00:44:59 +02:00
6a0e3ee0a5
exoscale: reuse "SecurityGroup" variable in "struct Driver"
...
Since the content of `struct Driver` is serialized to disk, any change
is problematic. A workaround is to keep using the `SecurityGroup` member
as a string (a comma-separated list of security groups).
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-30 11:09:13 +02:00
4ec3f206b4
exoscale: use `StringSlice` to specify security groups
...
This mean that the option has to be repeated to specify multiple
security groups.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-30 10:59:23 +02:00
5ba232227e
exoscale: ability to specify multiple security groups on instance creation
...
Without this feature, when a user needs a specific security group (i.e
most of the time if they want to expose a service to Internet), they
need to copy the rules needed for Docker itself into each custom
group. With this feature, they can spawn new instances with
`--exoscale-security-group docker-machine,my-custom-group`.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-30 10:59:23 +02:00
0694c0da81
Show requests made to AWS API in debug mode
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-06-17 17:29:00 -07:00
a6a6e16329
vbox: fix vbox race with unregistervm
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-15 17:04:46 -04:00
e91c28fad6
Check for IP to be assigned before returning from Start()
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-06-11 14:02:27 -07:00
5a59fa8f12
added deprecation comment
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-11 16:24:49 -04:00
f26fb12664
vbox: fix panic with custom cidr
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-11 14:04:48 -04:00
2f4d8c4237
vbox: refactor random IP allocation to func
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-09 11:05:29 -04:00
ca5f0738e2
vbox: allow specifying host only adapter cidr
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-09 11:05:29 -04:00
3304bf8923
virtualbox: check for hostonly iface and add if needed on start
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-09 11:05:29 -04:00
c1b9ef6743
Add option parameter availability_zone
...
Signed-off-by: Ling FaKe <lingfake@huawei.com>
2015-06-05 17:37:43 -07:00
f6a6a1f8c8
Merge pull request #1222 from zchee/update-amazonec2-ami
...
Update AMI to release 20150603
2015-06-05 10:30:57 -04:00
0dc1cc0ff3
Update AMI to release 20150603
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-06-05 05:33:06 +09:00
3c16a870ac
exoscale: move job waiting into a separate function
...
Waiting for a job to complete is split into a dedicated function,
outside of `waitForVM()`. Functions only waiting for the job to complete
will use this new function instead. The "job is done" testing logic is
also casted into a separate function.
The original `waitForVM()` function is now waiting for the job to
complete, then retrieve the VM. This introduces an extra API call which
could be avoided by having a `waitForJob()` return the last response but
this makes the code simpler for other users and adding a special variant
just for that seems to be overkill.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-03 09:33:17 +02:00
2d25f56ff7
exoscale: use the new `utils.WaitForSpecificOrError` function to wait for job to finish
...
Instead of using a custom loop, use the newly introduced
`utils.WaitForSpecificOrError` function. Beware that on success, we use
the successful response to get the VM object (outside the loop).
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-03 09:09:07 +02:00
2a60a4ea32
exoscale: ensure we sleep a bit while waiting for the VM to be ready
...
Otherwise, the timeout is reached far too soon: instead of waiting for
the VM for two minutes, we wait only for a couple of seconds.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-03 09:09:07 +02:00
a6c58534ca
exoscale: add the appropriate port to make Swarm work
...
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-02 11:44:18 +02:00
3cd44ec4ef
Merge pull request #1277 from ggiamarchi/openstack/bug#1269
...
Openstack / Stop polling the instance when status is ERROR
2015-06-01 08:40:59 -04:00
de817cfe46
Stop polling the instance when status is ERROR
...
Fix #1269
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-06-01 00:49:23 +02:00
904acb914a
Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot requests
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-05-30 22:25:36 -04:00
be7c110dfd
Merge pull request #1247 from ehazlett/redhat-tty-fix
...
redhat: fix tty provision bug
2015-05-27 13:57:44 -04:00
512f403bb2
Merge pull request #1244 from frapposelli/vcloudair-fix-catalogitem
...
Fix for the default vCloud Air catalog item.
2015-05-27 11:42:18 -04:00
ec5edb0354
redhat: fix tty provision bug
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-27 10:56:43 -04:00
e8cdc30549
Merge pull request #1215 from janeczku/driver-exoscale
...
exoscale: fix driver hanging on failed VM operation
2015-05-27 10:04:15 -04:00
850e21c3dc
Fix for the default vCloud Air catalog item.
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-05-27 15:17:26 +02:00
7c2a4ac12c
Merge pull request #1231 from frapposelli/move-vsphere-to-main-b2d
...
Moved VMware vSphere driver to main b2d release tree
2015-05-26 13:05:26 -04:00
74de38d97f
Merge pull request #1232 from frapposelli/move-fusion-to-main-b2d
...
[PR for 1.7.0] Move VMware Fusion driver to the official boot2docker release.
2015-05-26 12:26:34 -04:00
98e38006c0
Merge pull request #1218 from ehazlett/vbox-intel-nic
...
vbox: use intel driver for nic
2015-05-26 11:04:19 -04:00
4c1217aec8
Move `vmwarefusion` to the official boot2docker release.
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-05-26 10:36:02 +02:00
c4be194d41
Moved `vmwarevsphere` driver to main b2d release tree
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-05-26 10:06:24 +02:00
bbbaa8952e
exoscale: fixed 2 mins wait loop on failed operation
...
Signed-off-by: Jan Broer <janeczku@yahoo.de>
2015-05-23 06:09:01 +02:00
19d3bdd389
Merge pull request #1208 from exoscale/fix/exoscale-ssh-keypair
...
exoscale: destroy the SSH keypair when removing the machine
2015-05-22 09:58:59 -04:00
7f3bfb3e87
Merge pull request #1206 from miketheman/vmwarefusion_1168
...
Address vmwarefusion driver hang condition
2015-05-22 09:57:17 -04:00
f82032b28d
remove provider
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-21 10:41:03 -04:00
91c618fd06
Merge pull request #1174 from nathanleclaire/ssh_backends
...
Move to using SSH shellout by default, and Go native impl as a backup
2015-05-21 10:22:45 -04:00
d05a889c96
exoscale: simplify if/err pattern
...
Compact the if/err forms that can be compacted.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-05-21 14:34:42 +02:00
b772e66394
exoscale: destroy the SSH keypair when removing the machine
...
Otherwise, when recreating a machine with the same name, we would get an
error about this SSH keypair already existing.
To avoid any confusion, let's say that machine will handle all keypairs
and the user cannot provide its own. Therefore, move the keypairs into
their own "namespace" and remove the option to specify a keypair.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-05-21 14:34:42 +02:00
67a5018999
Get machine state before looking up URL in vmwarefusion
...
- Add a call to GetState() in GetIP() to bail if the machine is stopped,
similar to how it is done in the virtualbox driver.
- Add tests for `url` and `env` commands.
Fixes #1168
Signed-off-by: Mike Fiedler <miketheman@gmail.com>
2015-05-20 23:40:07 -04:00
2f78b7f92a
Move code to use SSH "backends"
...
Default to shelling out to SSH when available.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-19 15:02:57 -07:00
76ba5b258e
vbox: use intel driver for nic
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-19 09:26:24 -04:00
fe4652b21d
Defaulting SoftLayer hostname to machine name
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-18 16:07:59 -04:00
8afddbeab8
Fix cert copying bug
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-13 22:19:27 -07:00
cb6eb6bb77
amazonec2: instance profile env var
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-13 15:00:52 -04:00
f29c5fc4dc
Merge pull request #1086 from zchee/ec2-add-monitoring-flag
...
[EC2] Add Monitoring flag
2015-05-13 10:49:14 -04:00
91d945431f
Log ssh command output to Debug
...
I struggled to figure out why a machine create was failing, and
eventually asked if anyone else had seen the vague error I was getting:
"Error creating machine: Process exited with: 100. Reason was: ()"
It is immensely helpful if we log the command output instead of
just the rc.
It would also have been useful if the driver providers used the output, but
this covers most scenarios since they don't.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2015-05-08 09:35:59 -05:00
a3e08a010d
Merge pull request #1108 from ibuildthecloud/vbox-sleep
...
Fix issue where GetIP in VirtualBox failes due to no SSH
2015-05-07 13:33:26 -07:00
782e3aac11
Merge pull request #1135 from frapposelli/fusion-cpu-fix
...
CPU count fixes to `vmwarefusion`
2015-05-07 11:52:09 -07:00
13c1006f3b
CPU count fixes to `vmwarefusion`
...
- Added `--vmwarefusion-cpu-count` parameter
- Defaults to 1 Virtual CPU
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-05-07 02:16:20 +02:00
a7d63161ec
Merge pull request #406 from ehazlett/driver-generic
...
Generic Driver
2015-05-05 13:47:12 -07:00
60be4c292c
virtualbox: windows share support
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:31:43 -07:00
9030986a63
generic: pretty struct format
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:08:45 -07:00
e9e0fa5cfc
generic: remove unneeded check for ssh user
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:07:45 -07:00
e6159ce6c9
generic: reduce wait time for GetState
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:05:47 -07:00
fc49adbcdf
generic: use ~/.ssh/id_rsa as default ssh key
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
afb9cb39e2
generic: ssh timeout
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
2d525d0abd
generic: update to new logging; fix ssh user bug
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
8e0b80b015
generic: rename generic-user to generic-ssh-user; update docs
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
4e64ff79f9
generic: update for upstream driver specification
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
94ccd5cd5a
generic: remove unneeded config
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
f4c6730539
rebased and updated generic driver for latest driver spec
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
fb5036e8fd
generic: add precreatecheck to driver
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
85dac5440a
generic: minor logging update
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
b3a0a4a882
generic: use SSHPort
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
7fc50f3de3
add generic driver
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
8afe967a80
Fix issue where GetIP failes due to no SSH
...
The main goal of this patch was to make the VirtualBox driver wait for
SSH before trying to get the IP of the VM. The generic WaitForSSH
method required a Host struct as an arg. This patch moves most of the
logic to the driver package so that drivers can call WaitForSSH. The
existing functions in host are just wrappers to the real
implementation in drivers now.
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-05-05 09:32:45 -07:00
6d750d04f1
Fixing panic when d.deviceConfig is nil
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-04 22:13:50 -04:00
a5aa222f9f
Merge pull request #1101 from hairyhenderson/softlayer-vlan-support-766
...
Adding SoftLayer support for specifying Public and Private VLAN IDs
2015-05-04 12:35:02 -07:00
7c4ba8b560
Adding SoftLayer support for specifying Public and Private VLAN IDs
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-03 22:25:42 -04:00
bd35fb3101
Fixing bug in GetIP where Public IP would always be returned despite use of --softlayer-private-net-only
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-03 22:14:11 -04:00
6036c28fa5
Merge pull request #1085 from zchee/update-amazonec2-ami
...
[EC2] Update AMI to release 20150417
2015-05-01 16:40:57 -04:00
6a311b0069
Merge pull request #20 from exoscale/feature/exoscale-support
...
driver: exoscale driver
2015-05-01 16:31:31 -04:00
556060f6db
Update AMI to release 20150417
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-05-01 10:47:55 +09:00
8821e7e5ee
[EC2] Add Monitoring flag
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-05-01 10:41:47 +09:00
3739e4d067
Harmonizing drivers so IPAddress property is kept up-to-date
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-30 19:59:23 -04:00
fd569c8fdf
driver: exoscale driver
...
Add support for exoscale, a Swiss cloud provider. This pull "egoscale",
a Go binding for exoscale, in godeps.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-30 22:32:02 +02:00
142ffadc2c
Refactor logging to focus on simple STDOUT/STDERR
...
This also lays the foundation for the possibility of log drivers in the
future, if it is decided that is a direction to pursue.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-30 12:04:52 -07:00
03c245cf4f
Merge pull request #1033 from ehazlett/env-shell-selection
...
shell selection for env
2015-04-30 14:03:23 -04:00
6e39096962
Merge pull request #1063 from sthulb/ec2-ip
...
Add --amazonec2-private-address-only
2015-04-30 12:20:17 -04:00
d0651d0273
Add --amazonec2-private-address-only
...
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-04-30 16:42:44 +01:00
6fe4331fdd
vbox: stop before rm for stability
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-30 10:36:59 -04:00
03c1fbadc5
Merge pull request #1073 from ehazlett/vbox-use-single-core
...
vbox: use single cpu by default
2015-04-29 14:07:17 -04:00
aa5cda2e0b
Merge pull request #1072 from ehazlett/gce-fix-instance-refresh
...
gce: fix for instance not being refreshed on create
2015-04-29 14:06:41 -04:00
9e1185e06e
vbox: use dns pass through
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 12:33:10 -04:00
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
e8704b14f1
vbox: use single cpu by default
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:45:33 -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
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
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
bde6ad3fac
fixed b2d url bug with fusion / vsphere
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-24 15:21:15 -07:00
2151492dec
fix regression for custom b2d url paths
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-24 15:21:15 -07:00
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
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
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
263c802d34
Fix missing test files
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 17:05:27 -07:00
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
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
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
344c7d771a
Merge pull request #770 from ehazlett/x509-check-ip-san
...
certs: x509 check ip san
2015-03-17 14:04:58 -04:00
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
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
2da08635e8
Refactoring to move closures into methods
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-03-16 20:53:18 -04:00
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
92bb9e5e20
merged origin/master
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-11 23:02:22 -04:00
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
645bf8ab90
amazonec2: add SSHUser to driver
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-11 22:04:52 -04:00
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
b68f1146e2
Merge branch 'origin/master' into driver-refactor
2015-03-11 11:16:39 -04:00
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
58de06d0a1
merge master
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 17:59:22 -04:00
aae1cb35e7
Merge pull request #748 from ahmetalpbalkan/azure/syntax
...
drivers/azure: idiomatic syntax fixes
2015-03-10 16:20:48 -04:00
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
72f05505fa
vmwarevsphere: update with new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:41:02 -04:00
9e27af64e3
vmwarefusion: update with new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:27:11 -04:00
bff7e978cf
vmwarevcloudair: update with new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:11:04 -04:00
4b034fd1b6
softlayer: update with new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:58:52 -04:00
6f098c817b
openstack: driver cleanup for new interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:29:52 -04:00
6c931dadde
openstack: update for new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:27:17 -04:00
7e362cf4a3
hyperv: updated for new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:24:11 -04:00
ec91959979
google: updated to new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:18:18 -04:00
d2869cbd38
Merge remote-tracking branch 'origin/master' into driver-refactor
2015-03-09 22:53:41 -04:00
52a3019d00
azure: updated to driver interface; refactored common GetSSHCommandFromDriver for those that need it
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 22:53:21 -04:00
3351f8c58d
Merge pull request #726 from hairyhenderson/openstack-net-id-usage-fix
...
Fixing inaccurate Usage message for the `--openstack-net-id` option
2015-03-09 22:42:24 -04:00
790d0cbf49
Merge pull request #751 from slashk/750-virtualbox-saved-paused-support
...
fixes Issue #750 by allowing virtualbox driver
2015-03-09 22:41:19 -04:00
2f853ee671
Merge pull request #667 from ggiamarchi/openstack-dead-code
...
Openstack driver - Remove dead code
2015-03-09 22:39:09 -04:00
51aa826e14
digitalocean: update to driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 22:20:47 -04:00
6e81ba9fe7
virtualbox: finished driver updates
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 20:52:53 -04:00
bfd83eebbe
fixes Issue #750 by allowing virtualbox driver
...
start command to start VMs in saved state and
resume VMs in paused state.
Signed-off-by: Ken Pepple <ken@solinea.com>
converted to switch statement per @nathanleclaire suggestion
Signed-off-by: Ken Pepple <ken@solinea.com>
small typo
Signed-off-by: Ken Pepple <ken@solinea.com>
2015-03-10 00:32:39 +01:00
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
275cb37602
virtualbox: update to new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 17:53:30 -04:00
3347d1e82f
rename HypervisorType to ProviderType
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 16:03:36 -04:00
c76d1a253f
revert to GetSSHHostname based on feedback from @nathanleclaire
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 15:55:18 -04:00
0577f66f5d
initial work to get amazonec2 and none drivers to upgrade driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 12:50:40 -04:00
95a95a4c76
added GetHypervisorType
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 12:23:14 -04:00
bc78e0081e
enable port ranges for authorize/deauthorize
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 10:51:59 -04:00
b8ef936e90
add AuthorizePort and DeauthorizePort
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 10:50:48 -04:00
ae439188a0
use GetSSHAddress based on feedback from @sthulb
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 10:30:21 -04:00
007d83319d
start on refactor for driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 10:12:19 -04:00
e78269c287
drivers/azure: idiomatic syntax fixes
...
This change includes some shorthand syntax refactoring and dead code removal.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-06 23:38:57 -08:00
989db1bf96
Merge pull request #690 from nathanleclaire/universal_poll_retries
...
Introduce universal poll retries function
2015-03-06 13:55:33 -05:00
093914cbd5
Fixing inaccurate Usage message for the `--openstack-net-id` option
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-06 07:04:06 -05:00
2121382d08
Merge pull request #718 from cheng--zhang/wording
...
Modify description of StartDocker and StopDocker
2015-03-05 06:47:05 -08:00
b756be37eb
Modify description of StartDocker and StopDocker
...
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2015-03-05 16:09:19 +08:00
1e983d5ff6
Introduce universal poll retries function
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-04 16:41:48 -08:00
505c83629f
rackspace: enable env var for flavor id
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-04 13:19:08 -08:00
66664f8b25
Merge pull request #695 from knarz/add_digitalocean_flags
...
add flags for ipv6, backups and private networking to the DigitalOcean driver
2015-03-04 13:06:25 -08:00
8d0bf21c6d
Fix panic when instance doesn't exist remotely
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-03 14:48:04 -08:00
a7d1a70442
Fix IP address not being set correctly due to race
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-03 14:47:06 -08:00
3a030c9ccb
Clean up unused function
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-03 11:18:08 -08:00
17b928fac0
add flags for ipv6, backups and private networking to the DigitalOcean driver
...
Signed-off-by: Sascha Hanse <shanse@gmail.com>
2015-03-03 12:22:11 +01:00
Martin Schygulla
Vincent Bernat
Nathan LeClaire
Evan Hazlett
LingFaKe
Koichi Shiraishi
Guillaume Giamarchi
Dave Henderson
Fabio Rapposelli
Jan Broer
Mike Fiedler
Dave Henderson
Christy Perez
Darren Shepherd
Simon Thulbourn
John Fieber
Sascha Hanse
Rob Smart
Qicong Chen
wlan0
Dan Farrelly
Tom Barlow
Paul Biggar
Ke Zhu
Paul Czarkowski
Ash Wilson
Nathan LeClaire and Simon Thulborn
Ken Pepple
Ahmet Alp Balkan
Cheng Zhang