Commit Graph

48 Commits

Author SHA1 Message Date
Evan Hazlett
8b6ccddd80 Revert "Fix check for whether docker is installed" we need to revisit
This reverts commit ddc0c50b91.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-04 13:17:00 -08:00
Nathan LeClaire
ddc0c50b91 Fix check for whether docker is installed
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-04 11:34:48 -08:00
Vincent Giersch
12bed9eafc Provision OpenStack instances with Docker
Since 54f36078, Machine doesn't check anymore if Docker is installed
in the created instances, which breaks the compatibility between
v0.1.0-rc5 and v0.1.0 when using Machine with some cloud providers
like RunAbove.com.

Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
2015-02-27 10:53:38 +00:00
Evan Hazlett
cfc7764bc4 Merge pull request #610 from ehazlett/refactor-directories
refactor directories to machines, certs, cache
2015-02-25 16:32:36 -05: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
502945f577 Merge pull request #608 from bfirsh/use-random-strategy-for-swarms
Use random strategy for Swarms
2015-02-25 10:34:50 -05:00
Ben Firshman
aa3940deb7 Use random strategy for Swarms
Makes a better demo.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-02-25 15:06:51 +00:00
Evan Hazlett
36665be4ef Merge pull request #602 from ehazlett/get-ip-retry
allow retries for GetIP when issuing cert
2015-02-24 22:43:39 -05:00
Evan Hazlett
2ce177046a show errors in debug (feedback from @md5)
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 20:29:25 -05:00
Evan Hazlett
bf61a142b2 Merge pull request #599 from ehazlett/swarm-auto-labels
add swarm label of provider by default
2015-02-24 17:28:02 -05:00
Evan Hazlett
348be4d325 formatting from feedback from sthulb
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 14:52:19 -05:00
Evan Hazlett
e5c51d9e41 log debug message when waiting for ip
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 14:38:01 -05:00
Evan Hazlett
06c1c5cbeb use swarm labels as default
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 14:37:00 -05:00
Evan Hazlett
93dd4f11f6 allow retries for getIp when issuing cert
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 11:15:59 -05:00
Evan Hazlett
cec8973975 add swarm label of provider by default
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 10:20:47 -05:00
Evan Hazlett
54f36078f4 do not show debug for docker install by default; refactor install out of drivers
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-23 17:14:32 -05:00
Evan Hazlett
a48dfd3448 use swarm master also as node
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08: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
b908a9e655 use official swarm image
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
16e8159503 virtualbox swarm support
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett
557d03a849 tls fixes to support swarm; test updates; improved provisioning logging
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:20 -08:00
Evan Hazlett
a73deea5d0 swarm provisioning
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:20 -08:00
LaynePeng
4fee4925f2 #445-Fix Patch.
Signed-off-by: LaynePeng <appamail@hotmail.com>
2015-02-19 14:49:13 +08:00
Jeff Mendoza
6ff61d26c9 Update Hyper-V to TLS auth.
Signed-off-by: Jeff Mendoza <jeffmendoza@live.com>
2015-02-06 08:48:36 -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
371194ea8c use correct paths for custom TLS CA cert and key
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-27 11:59:59 -05: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
d48c0f4157 use server and username for certificate subject and issuer
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-26 17:56:33 -05:00
Evan Hazlett
a3e114737b fixes #282: use port from driver URL when configuring engine
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-26 11:17:12 -05:00
Simon Thulbourn
7f708e48c2 Valid hostname check
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-24 21:16:21 +00: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
e1d0c97770 do not autoremove machine on error (prevents removing existing machines)
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-19 13:52:25 -05:00
Evan Hazlett
c5076f81b1 fixes #289: path issue for windows machine clients
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-16 17:18:30 -05:00
Nathan LeClaire
4bc7dc5676 Correct *.pem names to work with DOCKER_CERT_PATH
See https://github.com/docker/docker/blob/master/docker/docker.go#L22

This is how things currently work with b2d.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-01-16 13:56:51 -08:00
Evan Hazlett
0c8ef0abe5 updated tests
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
Evan Hazlett
4534944f6a use tls for auth
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
c2f1fea9dc Merge pull request #219 from sthulb/hostnames
Hostnames
2015-01-14 09:31:43 -05:00
Evan Hazlett
8d40d8219c fixes #229: wait for docker before adding to known_hosts
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-12 15:20:03 -05:00
Simon Thulbourn
861b16dba9 add machine name to VM name and hostname
This work sets the machine name in the Cloud API or Hypervisor. As well
as setting the hostname inside the VM.

I've added the machine name to the NewDriver func to allow for
identification by Cloud APIs and for the driver package.

Each driver will attempt to set the hostname for the VM, except for
Azure, which sets it based on the DNS name.

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-12 16:46:00 +00:00
Evan Hazlett
414f94b7d1 add cleanup for create failure
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-07 17:35:33 -08:00
Evan Hazlett
b0936b1b53 automatically add host fingerprint to known hosts
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-02 15:40:11 -05:00
Ben Firshman
91172449c0 Handle errors in commands
Some errors were swallowed entirely, some didn't print the error
message.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-15 10:45:55 -08:00
Damien DUPORTAL
eda8bbd2bd Moving path to filepath dependency
Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>

Conflicts:
	drivers/azure/azure.go
	store.go
	store_test.go
2014-12-12 11:09:43 -08:00
Ben Firshman
73d19108bf Initial commit
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-04 15:05:11 +01:00