Commit Graph

71 Commits

Author SHA1 Message Date
Evan Hazlett e9491d22dc b2d import: move debug logging to debug
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:03 -04:00
Evan Hazlett 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
Evan Hazlett 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
Evan Hazlett a01322fa77 fixed ssh generation issue
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
Evan Hazlett 7a4e16e082 virtualbox: add ability to import b2d instances
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
Evan Hazlett 576951e03a wip: b2d import
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
Simon Thulbourn 709b0a84e3 Add SSH client
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-04-21 15:37:09 +01:00
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
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
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 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 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 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 d2869cbd38 Merge remote-tracking branch 'origin/master' into driver-refactor 2015-03-09 22:53:41 -04:00
Evan Hazlett 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
Evan Hazlett 6e81ba9fe7
virtualbox: finished driver updates
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 20:52:53 -04:00
Ken Pepple 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
Evan Hazlett 275cb37602
virtualbox: update to new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 17:53:30 -04:00
Evan Hazlett 7a101ac92c
refactor directories to machines, certs, cache
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-25 12:32:41 -05:00
Evan Hazlett e450a75be4
virtualbox: check state before attempting start
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 09:45:44 -05:00
Simon Thulbourn 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
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
Evan Hazlett b8ab9300e1 Merge pull request #453 from nathanleclaire/coverage
Add structure to generate code coverage representation
2015-02-16 14:19:01 -08:00
Sven Dowideit de62c65a71 Detect vboxmanage error conditions and pass those on as errors
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
2015-02-12 08:46:18 +10:00
Evan Hazlett e26d48ab5b Merge pull request #519 from ehazlett/fix-restart-vbox
fix bug with attempting to restart vbox instance that is not running
2015-02-11 13:15:39 -05:00
Sven Dowideit 467fc9a2ef Detect the location of VBoxManage.exe - it is often not in the PATH
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
2015-02-11 21:30:38 +10:00
Evan Hazlett 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
Jeff Mendoza d47000ea3b Update Boot2docker download, and consolitate util functions.
Signed-off-by: Jeff Mendoza <jeffmendoza@live.com>
2015-02-06 08:48:36 -05:00
Nathan LeClaire d1fdc87f54 Add structure to generate code coverage representation
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-02-02 13:41:42 -08:00
Evan Hazlett da64d92a74 tests for utils/b2d.go
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-02 15:46:24 -05:00
Evan Hazlett 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
Evan Hazlett 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
Simon Thulbourn 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
Evan Hazlett d5a4f2f1c4 Merge pull request #402 from ehazlett/single-tls
Update to TLS Certificates
2015-01-26 18:06:43 -05: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 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
Evan Hazlett 090e3328c8 refactor b2d retrieval for fusion/vbox
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
Evan Hazlett fbce999d22 updated godeps; fixed cert issue date bug
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
Evan Hazlett 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
Evan Hazlett fc2e5f278b configure opts for b2d
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett 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