1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

224 Commits

Author SHA1 Message Date
Guillaume Giamarchi
a2d64fe5c0 Support floating IP allocation and assignation
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:11:12 +01:00
Guillaume Giamarchi
edec8cd024 OpenStack & Rackspace driver documentation
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:11:12 +01:00
Guillaume Giamarchi
c16adeb46f Refactor option management to use codegangsta/cli
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:11:06 +01:00
Guillaume Giamarchi
c304288a82 Bugfix on openstack machine ssh
Bypass argument management for sudo if there is not arguments

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 22:01:32 +01:00
Ash Wilson
9fc0e3d72b Fix syntax and move init calls to the driver.
Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 22:01:32 +01:00
Ash Wilson
2fb9061142 Turn selected logging messages to "debug".
Otherwise, they interfere with the output of `machine url` and `machine ls`. `machine url`
is more important because it breaks the export statement to configure docker if it includes
additional output.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 22:01:32 +01:00
Ash Wilson
5f0fe8e704 Override GetInstanceIpAddresses for Rackspace.
Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 22:01:32 +01:00
Ash Wilson
816cc3c491 Fixes on OpenStack and Rackspace drivers
* Use the initialized client
* Fix the endpointType conditional
* Don't die if OS-EXT-IPS is not present
* Only log Openstack creation for Openstack drivers
* There's no option for MachineName, yet

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 22:01:32 +01:00
Ash Wilson
7c839273c1 Init methods are no-ops when already initialized.
Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 22:01:32 +01:00
Ash Wilson
8466d95fa0 Make service init calls into the driver methods.
Otherwise, because of the way Go does method dispatch, derived versions of
those methods will never be called.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 22:01:32 +01:00
Ash Wilson
b046940433 Validate and default Rackspace-specific options.
Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 22:01:32 +01:00
Ash Wilson
c12d3f8ecd Initial cut at a Rackspace driver.
* Wrap openstack.Client in an interface.
* Alternate openstack Driver creation method.
* Register the Rackspace driver in commands.go.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 22:01:31 +01:00
Vincent Giersch
0f02ebe6f2 OpenStack: Add inputs flavor, image and network by name
Added parameters:
    --openstack-image-name
    --openstack-flavor-name
    --openstack-net-name

Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
2015-01-14 22:01:31 +01:00
Vincent Giersch
71d267c2b8 OpenStack: Allow docker client public key
Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
2015-01-14 22:01:31 +01:00
Vincent Giersch
156e0acd32 OpenStack: Switch some Info log to Debug
Allow to use $(machine url) without having to pipe the
result due to too verbose Info logs.

Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
2015-01-14 22:01:31 +01:00
Vincent Giersch
59260f2716 OpenStack: Allow to provide both tenant name and id
When sourcing an OpenStack rc file, both variables OS_TENANT_ID
and OS_TENANT_NAME are defined.

Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
2015-01-14 22:01:31 +01:00
Guillaume Giamarchi
f6b0c81996 Add OpenStack driver
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 22:01:31 +01:00
Guillaume Giamarchi
1785869490 Add dependencies for OpenStack driver
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 22:01:30 +01:00
Evan Hazlett
c2f1fea9dc Merge pull request #219 from sthulb/hostnames
Hostnames
2015-01-14 09:31:43 -05:00
Evan Hazlett
37afa24a8e Merge pull request #276 from sthulb/vbox-store
Move VirtualBox configuration file to be inside the data store
2015-01-14 09:15:08 -05:00
Ben Firshman
9a2f8ca748 Merge pull request #266 from ehazlett/tls-check
fixes #229: wait for docker before adding to known_hosts
2015-01-14 13:52:47 +00:00
Simon Thulbourn
916e6fcad8 Move VirtualBox configuration file to be inside the data store
It turns out, that we only stored the actual disk inside the data store,
this brings it back inline with vmware

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-14 12:10:36 +00:00
Evan Hazlett
77b3c80eaf Merge pull request #241 from sthulb/aws-role-support
Aws role support
2015-01-13 15:06:21 -05:00
Simon Thulbourn
a70e8462cb adds support for AWS IAM roles
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-13 18:16:43 +00:00
Evan Hazlett
d0c18b6c52 Merge pull request #270 from ehazlett/allow-diff-test-interval
allow for arbitrary test interval
2015-01-13 12:17:14 -05:00
Evan Hazlett
a0b3aab8b2 allow for arbitrary test interval
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-13 12:16:37 -05:00
Evan Hazlett
241a003315 Merge pull request #269 from ehazlett/integration-test-updates
integration test updates
2015-01-13 10:01:52 -05:00
Evan Hazlett
3c55011995 wip: integration test updates
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-13 10:00:06 -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
8a0d468a49 Merge pull request #236 from nathanleclaire/docs
Add Machine docs
2015-01-12 11:45:16 -05:00
Evan Hazlett
4c285dcffa Merge pull request #258 from sthulb/unknown-command
Add unknown command help
2015-01-10 10:14:10 -08:00
Evan Hazlett
e0cbae3461 Merge pull request #257 from sthulb/ssh-keygen-fix
Adds check for SSH keygen command
2015-01-10 10:08:30 -08:00
Simon Thulbourn
ab9a19a85b Adds check for SSH keygen command
Adds a check to find ssh-keygen in the user's $PATH, in the event it
can't find it, return an error with a friendly message

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-10 12:17:40 +00:00
Evan Hazlett
9bc60fc192 Merge pull request #259 from andyshinn/digitalocean_listen_on_socket
Listen on unix socket in addition to TCP for Digital Ocean hosts
2015-01-09 17:39:40 -08:00
Andy Shinn
db5147e04f listen on unix socket on Digital Ocean hosts
Signed-off-by: Andy Shinn <andys@andyshinn.as>
2015-01-09 19:37:23 -06:00
Simon Thulbourn
c8b36dfbfc Add unknown command help
Spits out "machine: '<command>' is not a machine command see 'machine
--help'" to be inline with Docker

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-09 23:38:59 +00:00
Evan Hazlett
e1da47b7ca Merge pull request #252 from cloudnativeapps/fix-vsphere-doc
Doc fix for vSphere driver.
2015-01-09 10:39:39 -08:00
Fabio Rapposelli
6d394e3111 Doc fix for vSphere driver.
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
2015-01-09 10:37:12 +01:00
Nathan LeClaire
8fbc1cf476 Add Machine docs
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-01-08 16:19:32 -08:00
Evan Hazlett
5a251c5d1b Merge pull request #6 from cloudnativeapps/vmw-drivers
VMware host drivers for Fusion, vSphere and vCloud Air
2015-01-08 11:11:39 -08:00
Fabio Rapposelli
95e3664977 Updated README with instructions for VMware drivers.
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
2015-01-08 11:42:26 +01:00
Fabio Rapposelli
6b31904d43 Godeps save and enable commands
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
2015-01-08 11:00:54 +01:00
Yang Yang
1bad10773c Added vSphere machine driver
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
2015-01-08 11:00:39 +01:00
Fabio Rapposelli
92dd8e01d1 Added vCloud Air machine driver
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
2015-01-08 11:00:22 +01:00
Zee Yang
1e363a352a Added VMware Fusion machine driver
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
2015-01-08 10:59:58 +01:00
Evan Hazlett
9c3624b170 Merge pull request #234 from ehazlett/graceful-cleanup-on-create-fail
add cleanup for create failure
2015-01-07 17:54:20 -08:00
Evan Hazlett
df5ecadf80 logging updates from @nathanleclaire
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-07 17:37:17 -08: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
ce16cf4d7c Merge pull request #235 from nathanleclaire/flagsort
Fix some go vet complaints
2015-01-07 17:20:20 -08:00