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
e9491d22dc
b2d import: move debug logging to debug
...
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
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
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
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
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
2151492dec
fix regression for custom b2d url paths
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-24 15:21:15 -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
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
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
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
275cb37602
virtualbox: update to new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 17:53:30 -04:00
7a101ac92c
refactor directories to machines, certs, cache
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-25 12:32:41 -05:00
e450a75be4
virtualbox: check state before attempting start
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 09:45:44 -05:00
52782250d3
Move images dir to stop polluting the docker path
...
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-02-24 14:11:18 +00:00
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
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
9e161fafba
fix bug with attempting to restart vbox instance that is not running
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-09 15:36:18 -05:00
d47000ea3b
Update Boot2docker download, and consolitate util functions.
...
Signed-off-by: Jeff Mendoza <jeffmendoza@live.com>
2015-02-06 08:48:36 -05:00
da64d92a74
tests for utils/b2d.go
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-02 15:46:24 -05:00
dcf58cfc2d
host tests; refactor util functions to support testing
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-02 15:44:35 -05:00
d1ee81453c
add timeout for b2d release check; warn instead of error if cannot check
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-29 09:15:15 -05:00
1727123214
Remove $ from regexp
...
The GetState() func now works on Windows hosts
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-28 15:41:47 +00:00
d5a4f2f1c4
Merge pull request #402 from ehazlett/single-tls
...
Update to TLS Certificates
2015-01-26 18:06:43 -05:00
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
74f9bcebc7
only create ca and client cert once; create server keys each time; add serverAuth to ext usage
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-23 22:31:53 -05:00
090e3328c8
refactor b2d retrieval for fusion/vbox
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
fbce999d22
updated godeps; fixed cert issue date bug
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
9664d68889
rebase and updated fusion to work with standard docker b2d 1.4.1
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
fc2e5f278b
configure opts for b2d
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
4a47ce01fe
updated google driver; added StartDocker and StopDocker to driver
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
4534944f6a
use tls for auth
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
c2f1fea9dc
Merge pull request #219 from sthulb/hostnames
...
Hostnames
2015-01-14 09:31:43 -05:00
John Fieber
Evan Hazlett
Simon Thulbourn
Vincent Bernat
Nathan LeClaire
Tom Barlow
Guillaume Giamarchi
Paul Biggar
Ke Zhu
Ken Pepple
Jeff Mendoza