Commit Graph

42 Commits

Author SHA1 Message Date
Vincent Bernat 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
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
Evan Hazlett 2a93207bd9 Merge pull request #955 from ggiamarchi/keystone_v3_domains
Keystone v3 domains
2015-04-10 16:57:06 -04: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
Guillaume Giamarchi edbdbd7bbf Support Keystone v3 domains
Fix #679

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-04-09 17:40:21 +02: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 Czarkowski 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
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 6f098c817b
openstack: driver cleanup for new interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:29:52 -04:00
Evan Hazlett 6c931dadde
openstack: update for new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:27:17 -04:00
Evan Hazlett 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
Dave Henderson 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
Guillaume Giamarchi 5fa93a0888 Remove dead code
This method is no longer called since
the docker installation has moved out
of the driver (54f3607).

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-02-27 23:13:12 +01:00
Ash Wilson 5f20240340 Use --openstack-insecure to disable TLS checking.
At your own risk!

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-02-26 09:12:13 -06:00
Evan Hazlett 4f5de31d3f Merge pull request #590 from ehazlett/no-debug-for-docker-install
do not show debug for docker install by default
2015-02-24 15:01:20 -05:00
Evan Hazlett bebb2dc718
show detailed messages only in debug for rackspace remove
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 11:02:49 -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 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
Jamie Furness d1ccb16a5c Need to sudo to install the package as well as perform update.
Signed-off-by: Jamie Furness <jamie@jamierf.co.uk>
2015-02-11 15:35:38 +00:00
Sven Dowideit 5c4ee75f4e Add driver names to a few flag descriptions to make is consistent
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-09 10:18:55 +10: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 75f79ed25e use ubuntu 14.04 for remaining drivers
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-23 17:08:29 -05:00
Evan Hazlett 3212d0c509 tls for openstack/rackspace
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
Guillaume Giamarchi 9d91f458f5 Set machine hostname
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:20:23 +01:00
Ash Wilson e44b840e3a OpenStack driver enhancements
* Log machine creation.
* Typo in an error message 💅
* Shelve docker install output in /var/log.
* Improve the docker installation error message. Also, keep it from interrupting the host creation, so that you can actually run `machine ssh` or `machine rm` on the host afterward.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 23:15:32 +01:00
Guillaume Giamarchi bb5cf85a7e Assume machine is running Ubuntu when installing docker
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:15:32 +01:00
Ash Wilson c5c15618e8 Allow derived drivers to enable the Docker install.
Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 23:15:26 +01:00
Ash Wilson 5636679367 Rackspace driver enhancements & fixes
* checkConfig is no longer a thing.
* Change the default Rackspace image to Ubuntu 14.04.
* Remove an unnecessary Network service.
* Show a nicer error when the Region is omitted.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 23:13:40 +01:00
Guillaume Giamarchi 2332bcc9d8 Add flag --openstack-docker-install
Boolean flag to indicate if docker have to
be installed on the machine. Useful when
docker is already installed and configured
in the OpenStack image. Default set to `true`

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:13:24 +01:00
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 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 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 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 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