Commit Graph

635 Commits

Author SHA1 Message Date
Nathan LeClaire c8edb33ecd Move towards using external binaries / RPC plugins
- First RPC steps

- Work on some flaws in RPC model

- Remove unused TLS settings from Engine and Swarm options

- Add code to correctly encode data over the network

- Add client driver for RPC

- Rename server driver file

- Start to make marshal make sense

- Fix silly RPC method args and add client

- Fix some issues with RPC calls, and marshaling

- Simplify plugin main.go

- Move towards 100% plugin in CLI

- Ensure that plugin servers are cleaned up properly

- Make flag parsing for driver flags work properly

Includes some work carried from @dmp42 updating the build process and
tests to use the new method.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-16 16:34:56 -07:00
Nathan LeClaire 600ffb7d20 Merge pull request #1968 from cmouttet/1967-openstack_InstanceIpAddress_default
add default AddressType: Fixed
2015-10-15 14:19:54 -07:00
Olivier Gambier 4c12502605 Merge pull request #1977 from dgageot/1972-fix-google-driver-tags-no-tests
Fix broken google driver
2015-10-14 10:27:42 -07:00
David Gageot 264ca68902 Fix #1972 Google drive is broken because of tags
Signed-off-by: David Gageot <david@gageot.net>
2015-10-14 09:25:44 +02:00
Christian Mouttet e256702c8c add default AddressType: Fixed
Signed-off-by: Christian Mouttet <cmouttet@gmail.com>
2015-10-10 17:19:45 +02:00
Marcel Harkema db9363ef46 Fix config drive support in VMware Fusion driver
Signed-off-by: Marcel Harkema <marcel@harkema.name>
2015-10-10 16:10:11 +02:00
Guillaume Giamarchi 6829837fd5 Add environment varibles for OpenStack flags
Some flags for the OpenStack driver did not have
a corresponding environment variable.

Among others, this is needed to run bats core tests
with the OpenStack driver.

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-10-09 15:16:00 +02:00
Olivier Gambier 53658e8932 Merge pull request #1933 from hironobu-s/openstack-ip-version
Add --openstack-ip-version option
2015-10-08 16:26:08 -07:00
Hironobu Saitoh f659e817b4 Add --openstack-ip-version option
This option allows users to specify IP version.

Signed-off-by: Hironobu Saitoh <hiro@hironobu.org>
2015-10-09 07:29:48 +09:00
Nathan LeClaire 2399bfe578 Merge pull request #1952 from nathanleclaire/vbox_version
Move VBox detection to Precreate and print version
2015-10-08 11:01:31 -07:00
Nathan LeClaire 571712122d Merge pull request #1909 from skatsuta/saved-host-active
Change 'ls' to not report 'Saved' hosts as active when $DOCKER_HOST is not set
2015-10-08 11:00:45 -07:00
Soshi Katsuta 5af32bcdd3 commands: make `ls` to not report saved hosts to be active when $DOCKER_HOST is not set
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
2015-10-09 00:59:33 +09:00
Nathan LeClaire f0ebeab041 Move VBox detection to Precreate and print version
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-07 20:41:26 -07:00
Nathan LeClaire 94c551b964 Fix broken --storage-path flag
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-07 13:31:00 -07:00
Gianpaolo Macario b01442c6bb fix IPV6NetworkMaskPrefixLength value parsing #1692
Adapted from 941c70cb01

Signed-off-by: Gianpaolo Macario <gmacario@gmail.com>
2015-10-06 22:43:55 +02:00
Alexey Grachov 2992237b03 Additional info message while waiting for IP address.
It takes a lot of time to assign the IP to droplet, so informing user
about this hang looks like good idea.

Signed-off-by: Alexey Grachov <grachov.alexey@gmail.com>
2015-09-30 12:00:08 +03:00
Evan Hazlett c4cd2385bf Merge pull request #1685 from nathanleclaire/daemon_wait_over_ssh
Fix Docker daemon wait
2015-09-24 16:56:37 -04:00
Nathan LeClaire bee5cb4768 Merge pull request #1894 from dmp42/7-vbox
Fix exec error bubbling
2015-09-23 16:43:23 -07:00
Nathan LeClaire 9453df4859 Fix Docker daemon wait
Also, a few various cleanups are bundled:

1. Only call GetDriver() once to get the object in provision/utils.go
2. SSH command wrapper will return the error and let the consumer decide
   what to do with it instead of bailing automatically on non-255

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-23 15:19:25 -07:00
Nathan LeClaire b5927f10c4 Make libmachine usable by outside world
- Clear out some cruft tightly coupling libmachine to filestore

- Comment out drivers other than virtualbox for now

- Change way too many things

- Mostly, break out the code to be more modular.

- Destroy all traces of "provider" in its current form.  It will be
brought back as something more sensible, instead of something which
overlaps in function with both Host and Store.

- Fix mis-managed config passthru

- Remove a few instances of state stored in env vars

- This should be explicitly communicated in Go-land, not through the
shell.

- Rename "store" module to "persist"

- This is done mostly to avoid confusion about the fact that a concrete
instance of a "Store" interface is oftentimes referred to as "store" in
the code.

- Rip out repetitive antipattern for getting store

- This replaces the previous repetive idiom for getting the cert info, and
consequently the store, with a much less repetitive idiom.

- Also, some redundant methods in commands.go for accessing hosts have
either been simplified or removed entirely.

- First steps towards fixing up tests

- Test progress continues

- Replace unit tests with integration tests

- MAKE ALL UNIT TESTS PASS YAY

- Add helper test files

- Don't write to disk in libmachine/host

- Heh.. coverage check strikes again

- Fix remove code

- Move cert code around

- Continued progress: simplify Driver

- Fixups and make creation work with new model

- Move drivers module inside of libmachine

- Move ssh module inside of libmachine

- Move state module to libmachine

- Move utils module to libmachine

- Move version module to libmachine

- Move log module to libmachine

- Modify some constructor methods around

- Change Travis build dep structure

- Boring gofmt fix

- Add version module

- Move NewHost to store

- Update some boring cert path infos to make API easier to use

- Fix up some issues around the new model

- Clean up some cert path stuff

- Don't use shady functions to get store path :D

- Continue artifact work

- Fix silly machines dir bug

- Continue fixing silly path issues

- Change up output of vbm a bit

- Continue work to make example go

- Change output a little more

- Last changes needed to make create finish properly

- Fix config.go to use libmachine

- Cut down code duplication and make both methods work with libmachine

- Add pluggable logging implementation

- Return error when machine already in desired state

- Update example to show log method

- Fix file:// bug

- Fix Swarm defaults

- Remove unused TLS settings from Engine and Swarm options

- Remove spurious error

- Correct bug detecting if migration was performed

- Fix compilation errors from tests

- Fix most of remaining test issues

- Fix final silly bug in tests

- Remove extraneous debug code

- Add -race to test command

- Appease the gofmt

- Appease the generate coverage

- Making executive decision to remove Travis coverage check

In the early days I thought this would be a good idea because it would
encourage people to write tests in case they added a new module.  Well,
in fact it has just turned into a giant nuisance and made refactoring
work like this even more difficult.

- Move Get to Load
- Move HostListItem code to CLI

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-23 12:30:15 -07:00
Olivier Gambier 144b94c251 Fix error reporting on VBoxManage not found
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-09-22 21:01:38 -07:00
Nathan LeClaire 3b85723982 Fix failing case creating host only interface
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-22 20:02:14 -07:00
Nathan LeClaire fe5b5cf86d Add tests for host only network retrieval feature
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-22 16:29:25 -07:00
Ron Williams 0b5f4c8454 Handle bad netmask returned by virtualbox after hostonlyif creation. Fixes #1843
Signed-off-by: Ron Williams <ron.a.williams@gmail.com>
2015-09-21 14:09:29 -07:00
Olivier Gambier 5fbfbe1ff7 Rehauled build system and integration testing
- USE_CONTAINER allow to seamlessly run targets inside or outside containers
- all build calls have been harmonized, honoring the same env variables
- contributing doc has been streamlined according to that
- kill the distinction between remote and local docker builds
- got rid of some of the byzantine calls in various asorted scripts
- support for static build, debug builds, verbose

Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-09-18 15:47:00 -07:00
Nathan LeClaire b91c117238 Merge pull request #1816 from frapposelli/fusion-fuse-mount
Adding FUSE HGFS mount option
2015-09-16 16:07:31 -07:00
Nathan LeClaire 5e698f3d95 Merge pull request #1631 from dgageot/features/startstop
FIX #676 - Support Start/Stop GCE instance
2015-09-15 11:54:51 -07:00
Nathan LeClaire 207a647a40 Merge pull request #1633 from dgageot/features/tags
FIX #1297 - Support additional tags on GCE
2015-09-15 11:54:39 -07:00
David Gageot 66078be1e5 FIX #1297 - Support additional tags on GCE
Signed-off-by: David Gageot <david@gageot.net>
2015-09-15 06:56:52 +02:00
David Gageot bb45f83319 FIX #676 - Support Start/Stop GCE instance
Signed-off-by: David Gageot <david@gageot.net>
2015-09-15 06:54:53 +02:00
Matt McNaughton a0b9d179b1 Fix Go Vet errors
This commit makes no changes to code execution, but rather resolves some
`go vet` errors, the majority of which relate to `fatal` being used
instead of `fatalf` during testing.

Signed-off-by: Matt McNaughton <mattjmcnaughton@gmail.com>
2015-09-14 22:37:16 -04:00
Nathan LeClaire b52fa33056 Merge pull request #1479 from mschygulla/enhanced-vmwarefusion-driver
[Enhancement] VMware Fusion driver
2015-09-11 14:26:30 -07:00
Nathan LeClaire 7c4d0a5da7 Merge pull request #1642 from ddaze/openstack-retry
openstack: New machine active timeout parameter
2015-09-11 14:25:11 -07:00
Nathan LeClaire 5ba35ac2de Merge pull request #1812 from jclagache/master
1434-Added homebrew cask support for VMware Fusion
2015-09-11 14:21:39 -07:00
Nathan LeClaire 1b0042e69b Merge pull request #1836 from dmp42/2-fmt
Fmt fixes
2015-09-10 19:07:06 -07:00
Olivier Gambier 9d60bb7c73 Fmt fixes
Signed-off-by: Olivier Gambier <viapanda@gmail.com>
2015-09-10 18:27:13 -07:00
Nathan LeClaire 0fb4991068 Merge pull request #1796 from rikdev/powershell-no-profile
Disabled load PowerShell profile when start the powershell.exe
2015-09-10 15:19:47 -07:00
jclagache ebbc45abea 1434-Added homebrew cask support for VMware Fusion
This aims to lookup for Vmware Fusion required binaries (vmrun and vmware-vdiskmanager) in the system path first before falling back in the default Vmware Fusion installing path.
Thereby, the vmwarefusion docker-machine driver can now be used even if Vmware Fusion is not installed in its default location (with brew cask for example).
Signed-off-by: Jean-Christophe Lagache <jclagache@gmail.com>
2015-09-08 13:39:56 +02:00
Fabio Rapposelli c3ed882b76 Adding FUSE HGFS mount option
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-09-07 17:31:21 +02:00
Evan Hazlett 3c712ae30a
change debug env var to MACHINE_DEBUG
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-09-05 08:57:03 -04:00
Ivan Ryabchenko d4ce483ebc Disabled load PowerShell profile when start the interpreter powershell.exe
Signed-off-by: Ivan Ryabchenko <rik.ggm@gmail.com>
2015-09-03 02:29:36 +06:00
Evan Hazlett b8f7c3446b Merge pull request #1674 from csakoda/fix-VBox-getRandomIPinSubnet
Fix VirtualBox DHCPServer always uses x.x.x.1, despite getRandomIPinSubnet()
2015-08-28 18:29:01 -04:00
Nathan LeClaire 52dc5734a7 Merge pull request #1735 from praveen12bnitt/1733-virtualbox-network-tuning
added support for configuring nictype and nicpromise mode in virtualbox
2015-08-21 07:51:30 +09:00
Fabio Rapposelli ffe1a7940b [GH-1740] Fix cpu allocation bug
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-08-20 15:40:06 +02:00
Palanivelrajan Balasubramanian 5f362aca6b added support for configuring nictype and nicpromise mode in virtualbox
Signed-off-by: Palanivelrajan Balasubramanian <praveen12bnitt@gmail.com>
2015-08-19 16:49:42 -04:00
Chuck Sakoda c2c942411b Assign the last octet of random subnet IP to a random value, instead of always 1
Signed-off-by: Chuck Sakoda <cms235@gmail.com>
2015-08-12 13:20:58 -07:00
David McKay 07e7604f0e * Added option to disable virtualbox vbfs user home directory mount
* Updated documentation with new option
* Updated flag name

Signed-off-by: David McKay <david@rawkode.com>
2015-08-12 20:37:06 +01:00
Nathan LeClaire 5e486e6bf2 Merge pull request #1667 from ehazlett/digitalocean-ssh-user
digitalocean: enable specifying ssh user
2015-08-11 11:24:24 -07:00
David Zerulla 66b4e3b826 openstack: New machine active timeout parameter
* Adds `--openstack-active-timeout` parameter to set the timeout
  until a machine is active. Closes #1632

Signed-off-by: David Zerulla <ddaze@outlook.de>
2015-08-11 17:45:08 +02:00
Rodrigo Reis 04b435c832 Amazon Ec2 - Add the option amazonec2-use-private-address
Signed-off-by: Rodrigo Reis <rodrigo@rodrigoreis.com>
2015-08-11 07:29:13 -04:00
Evan Hazlett 8299069a46
digitalocean: enable specifying ssh user
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-08-11 07:01:52 -04:00
Evan Hazlett c1acb74d7a Merge pull request #1508 from ericsage/filter_names
Add name filter for #1488
2015-08-11 06:33:09 -04:00
Anurag Gupta 938290f773 removed extra code and fixed code formatting in azure addDockerEndpoint
Signed-off-by: Anurag Gupta <agup006@gmail.com>
2015-08-06 18:32:30 +00:00
Anurag Gupta 99544a4cb0 Add Azure Swarm Master Port endpoint configuration when using docker machine.
Signed-off-by: Anurag Gupta <agup006@gmail.com>
2015-08-05 08:17:51 +00:00
Martin Schygulla 82a7bf4e0d Merge branch 'master' into enhanced-vmwarefusion-driver 2015-08-04 13:40:38 +02:00
Nathan LeClaire 8ba5a57072 Revert "Merge pull request #1552 from ehazlett/b2d-next"
This reverts commit 736ebb14fb, reversing
changes made to c6660bf62c.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-08-03 14:46:52 -07:00
Evan Hazlett 12f7ac57ae Merge pull request #1467 from dgageot/master
Support Static IPs and Preemptible instances on Google Compute Engine
2015-07-31 05:45:06 -07:00
Evan Hazlett 7614212d4f Merge pull request #1564 from nathanleclaire/revert_migration
Revert configuration migration removal, include new version field, and introduce migration boilerplate
2015-07-29 16:50:49 -07:00
Nathan LeClaire fb2e843e99 - Re-introduce config migration; fix panics occurring from older configs
- Introduce boilerplate for config.json migrations

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-28 15:38:16 -07:00
Evan Hazlett 0b03589187
fusion: use mkdir -p for home dir mount
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 17:34:07 -04:00
Evan Hazlett 5f972ad759
fusion: @tianon to the rescue <3; shared folders work again
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 12:31:36 -04:00
Evan Hazlett 7b5e887275 hyperv: update to b2d-ng and some extra <3
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 10:20:47 -04:00
Evan Hazlett cb80c434ac b2d: use direct urls until release; devicemapper for engine opts tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

b2d-ng: use driver names for iso versions

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett 95c9b622dd fusion: update for b2d-ng
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett c6e9849783 vbox: restrict regex matching for msys translated paths
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: remove tar loading from virtual disk creation

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

tests: use btrfs instead of overlay for custom option test

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett e09f2fdd9c vbox: change to get latest released iso instead of pre-release
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: fix windows share dir for homedir

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: update tests for b2d

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett ab31d52165 update vbox driver to work with new b2d
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: lock down shared folders to user home dir

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

use env var for user for cross platform

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: remove sudo from setting ssh key for user

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: use homedir for share

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-23 19:40:07 -04:00
Eric Sage b333ea5294 Add regex based name filter to ls command.
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add regex support

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Allow bad regex passthrough to reg string amtch

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add unit test

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add integration tests

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add documentation for name filter.

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-22 21:06:26 -04:00
Evan Hazlett 89e6530528 Merge pull request #1501 from nathanleclaire/bail_on_failed_ssh
Bail on failed SSH command with information about what failed
2015-07-21 17:52:15 -04:00
Nathan LeClaire 6db82141f0 Bail on failed SSH command with information about what failed
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-21 14:49:24 -07:00
David Gageot 8aa5e0771a Support static IP by name on GCE
Signed-off-by: David Gageot <david@gageot.net>
2015-07-19 16:31:05 +02:00
David Gageot 8ce161e830 Support Preemptiple instances on GCE
Signed-off-by: David Gageot <david@gageot.net>
2015-07-18 08:18:35 +02:00
David Gageot e5a7059289 Support static IP on GCE
Signed-off-by: David Gageot <david@gageot.net>
2015-07-18 08:17:50 +02:00
Martin Schygulla 64e21418dd Merge branch 'master' of https://github.com/docker/machine into enhanced-vmwarefusion-driver 2015-07-16 00:33:14 +02:00
Martin Schygulla 6726ce915e Merge branch 'master' into enhanced-vmwarefusion-driver 2015-07-11 22:40:50 +02:00
Nathan LeClaire 8089e222c3 Remove synthcpu flag for Virtualbox 5 support
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-09 10:42:46 -07:00
Evan Hazlett 69dc9fd7f3 Merge pull request #1273 from hairyhenderson/default-driver-impl
refactor: Extracting a base Driver struct
2015-07-09 01:59:05 -06:00
Nathan LeClaire 9053ee24c7 Fix choke when starting from Saved state
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-07 14:36:21 -07:00
Dave Henderson 3d002187fe Refactoring drivers to embed drivers.DefaultDriver
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-07-07 11:24:00 -04:00
Martin Schygulla 66114abb0d Improved handling of boot delays until VM comes online
Signed-off-by: Martin Schygulla <martin.schygulla@gmail.com>
2015-07-07 04:18:49 +02:00
Martin Schygulla e7e68149e5 Enhanced driver for VMWare Fusion to support configuration data for cloud-init.
The userdata is injected into the VM as an ISO via the cdrom.

Signed-off-by: Martin Schygulla <martin.schygulla@gmail.com>
2015-07-06 00:44:59 +02:00
Vincent Bernat 6a0e3ee0a5 exoscale: reuse "SecurityGroup" variable in "struct Driver"
Since the content of `struct Driver` is serialized to disk, any change
is problematic. A workaround is to keep using the `SecurityGroup` member
as a string (a comma-separated list of security groups).

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-30 11:09:13 +02:00
Vincent Bernat 4ec3f206b4 exoscale: use `StringSlice` to specify security groups
This mean that the option has to be repeated to specify multiple
security groups.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-30 10:59:23 +02:00
Vincent Bernat 5ba232227e exoscale: ability to specify multiple security groups on instance creation
Without this feature, when a user needs a specific security group (i.e
most of the time if they want to expose a service to Internet), they
need to copy the rules needed for Docker itself into each custom
group. With this feature, they can spawn new instances with
`--exoscale-security-group docker-machine,my-custom-group`.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-30 10:59:23 +02:00
Nathan LeClaire 0694c0da81 Show requests made to AWS API in debug mode
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-06-17 17:29:00 -07:00
Evan Hazlett a6a6e16329
vbox: fix vbox race with unregistervm
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-15 17:04:46 -04:00
Nathan LeClaire e91c28fad6 Check for IP to be assigned before returning from Start()
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-06-11 14:02:27 -07:00
Evan Hazlett 5a59fa8f12
added deprecation comment
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-11 16:24:49 -04:00
Evan Hazlett f26fb12664
vbox: fix panic with custom cidr
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-11 14:04:48 -04:00
Evan Hazlett 2f4d8c4237 vbox: refactor random IP allocation to func
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-09 11:05:29 -04:00
Evan Hazlett ca5f0738e2 vbox: allow specifying host only adapter cidr
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-09 11:05:29 -04:00
Evan Hazlett 3304bf8923 virtualbox: check for hostonly iface and add if needed on start
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-09 11:05:29 -04:00
LingFaKe c1b9ef6743 Add option parameter availability_zone
Signed-off-by: Ling FaKe <lingfake@huawei.com>
2015-06-05 17:37:43 -07:00
Evan Hazlett f6a6a1f8c8 Merge pull request #1222 from zchee/update-amazonec2-ami
Update AMI to release 20150603
2015-06-05 10:30:57 -04:00
Koichi Shiraishi 0dc1cc0ff3
Update AMI to release 20150603
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-06-05 05:33:06 +09:00
Vincent Bernat 3c16a870ac exoscale: move job waiting into a separate function
Waiting for a job to complete is split into a dedicated function,
outside of `waitForVM()`. Functions only waiting for the job to complete
will use this new function instead. The "job is done" testing logic is
also casted into a separate function.

The original `waitForVM()` function is now waiting for the job to
complete, then retrieve the VM. This introduces an extra API call which
could be avoided by having a `waitForJob()` return the last response but
this makes the code simpler for other users and adding a special variant
just for that seems to be overkill.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-03 09:33:17 +02:00
Vincent Bernat 2d25f56ff7 exoscale: use the new `utils.WaitForSpecificOrError` function to wait for job to finish
Instead of using a custom loop, use the newly introduced
`utils.WaitForSpecificOrError` function. Beware that on success, we use
the successful response to get the VM object (outside the loop).

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-03 09:09:07 +02:00
Vincent Bernat 2a60a4ea32 exoscale: ensure we sleep a bit while waiting for the VM to be ready
Otherwise, the timeout is reached far too soon: instead of waiting for
the VM for two minutes, we wait only for a couple of seconds.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-03 09:09:07 +02:00
Vincent Bernat a6c58534ca exoscale: add the appropriate port to make Swarm work
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-02 11:44:18 +02:00
Evan Hazlett 3cd44ec4ef Merge pull request #1277 from ggiamarchi/openstack/bug#1269
Openstack / Stop polling the instance when status is ERROR
2015-06-01 08:40:59 -04:00
Guillaume Giamarchi de817cfe46 Stop polling the instance when status is ERROR
Fix #1269

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-06-01 00:49:23 +02:00
Dave Henderson 904acb914a Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot requests
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-05-30 22:25:36 -04:00
Evan Hazlett be7c110dfd Merge pull request #1247 from ehazlett/redhat-tty-fix
redhat: fix tty provision bug
2015-05-27 13:57:44 -04:00
Evan Hazlett 512f403bb2 Merge pull request #1244 from frapposelli/vcloudair-fix-catalogitem
Fix for the default vCloud Air catalog item.
2015-05-27 11:42:18 -04:00
Evan Hazlett ec5edb0354
redhat: fix tty provision bug
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-27 10:56:43 -04:00
Evan Hazlett e8cdc30549 Merge pull request #1215 from janeczku/driver-exoscale
exoscale: fix driver hanging on failed VM operation
2015-05-27 10:04:15 -04:00
Fabio Rapposelli 850e21c3dc Fix for the default vCloud Air catalog item.
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-05-27 15:17:26 +02:00
Evan Hazlett 7c2a4ac12c Merge pull request #1231 from frapposelli/move-vsphere-to-main-b2d
Moved VMware vSphere driver to main b2d release tree
2015-05-26 13:05:26 -04:00
Evan Hazlett 74de38d97f Merge pull request #1232 from frapposelli/move-fusion-to-main-b2d
[PR for 1.7.0] Move VMware Fusion driver to the official boot2docker release.
2015-05-26 12:26:34 -04:00
Evan Hazlett 98e38006c0 Merge pull request #1218 from ehazlett/vbox-intel-nic
vbox: use intel driver for nic
2015-05-26 11:04:19 -04:00
Fabio Rapposelli 4c1217aec8 Move `vmwarefusion` to the official boot2docker release.
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-05-26 10:36:02 +02:00
Fabio Rapposelli c4be194d41 Moved `vmwarevsphere` driver to main b2d release tree
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-05-26 10:06:24 +02:00
Jan Broer bbbaa8952e exoscale: fixed 2 mins wait loop on failed operation
Signed-off-by: Jan Broer <janeczku@yahoo.de>
2015-05-23 06:09:01 +02:00
Evan Hazlett 19d3bdd389 Merge pull request #1208 from exoscale/fix/exoscale-ssh-keypair
exoscale: destroy the SSH keypair when removing the machine
2015-05-22 09:58:59 -04:00
Evan Hazlett 7f3bfb3e87 Merge pull request #1206 from miketheman/vmwarefusion_1168
Address vmwarefusion driver hang condition
2015-05-22 09:57:17 -04:00
Evan Hazlett f82032b28d remove provider
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-21 10:41:03 -04:00
Evan Hazlett 91c618fd06 Merge pull request #1174 from nathanleclaire/ssh_backends
Move to using SSH shellout by default, and Go native impl as a backup
2015-05-21 10:22:45 -04:00
Vincent Bernat d05a889c96 exoscale: simplify if/err pattern
Compact the if/err forms that can be compacted.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-05-21 14:34:42 +02:00
Vincent Bernat b772e66394 exoscale: destroy the SSH keypair when removing the machine
Otherwise, when recreating a machine with the same name, we would get an
error about this SSH keypair already existing.

To avoid any confusion, let's say that machine will handle all keypairs
and the user cannot provide its own. Therefore, move the keypairs into
their own "namespace" and remove the option to specify a keypair.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-05-21 14:34:42 +02:00
Mike Fiedler 67a5018999 Get machine state before looking up URL in vmwarefusion
- Add a call to GetState() in GetIP() to bail if the machine is stopped,
  similar to how it is done in the virtualbox driver.
- Add tests for `url` and `env` commands.

Fixes #1168

Signed-off-by: Mike Fiedler <miketheman@gmail.com>
2015-05-20 23:40:07 -04:00
Nathan LeClaire 2f78b7f92a Move code to use SSH "backends"
Default to shelling out to SSH when available.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-19 15:02:57 -07:00
Evan Hazlett 76ba5b258e
vbox: use intel driver for nic
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-19 09:26:24 -04:00
Dave Henderson fe4652b21d Defaulting SoftLayer hostname to machine name
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-18 16:07:59 -04:00
Nathan LeClaire 8afddbeab8 Fix cert copying bug
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-13 22:19:27 -07:00
Evan Hazlett cb6eb6bb77
amazonec2: instance profile env var
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-13 15:00:52 -04:00
Evan Hazlett f29c5fc4dc Merge pull request #1086 from zchee/ec2-add-monitoring-flag
[EC2] Add Monitoring flag
2015-05-13 10:49:14 -04:00
Christy Perez 91d945431f Log ssh command output to Debug
I struggled to figure out why a machine create was failing, and
eventually asked if anyone else had seen the vague error I was getting:
"Error creating machine: Process exited with: 100. Reason was: ()"

It is immensely helpful if we log the command output instead of
just the rc.

It would also have been useful if the driver providers used the output, but
this covers most scenarios since they don't.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2015-05-08 09:35:59 -05:00
Evan Hazlett a3e08a010d Merge pull request #1108 from ibuildthecloud/vbox-sleep
Fix issue where GetIP in VirtualBox failes due to no SSH
2015-05-07 13:33:26 -07:00
Evan Hazlett 782e3aac11 Merge pull request #1135 from frapposelli/fusion-cpu-fix
CPU count fixes to `vmwarefusion`
2015-05-07 11:52:09 -07:00
Fabio Rapposelli 13c1006f3b CPU count fixes to `vmwarefusion`
- Added `--vmwarefusion-cpu-count` parameter
- Defaults to 1 Virtual CPU

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-05-07 02:16:20 +02:00
Evan Hazlett a7d63161ec Merge pull request #406 from ehazlett/driver-generic
Generic Driver
2015-05-05 13:47:12 -07:00
Evan Hazlett 60be4c292c virtualbox: windows share support
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:31:43 -07:00
Evan Hazlett 9030986a63
generic: pretty struct format
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:08:45 -07:00
Evan Hazlett e9e0fa5cfc
generic: remove unneeded check for ssh user
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:07:45 -07:00
Evan Hazlett e6159ce6c9
generic: reduce wait time for GetState
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:05:47 -07:00
Evan Hazlett fc49adbcdf generic: use ~/.ssh/id_rsa as default ssh key
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett afb9cb39e2 generic: ssh timeout
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett 2d525d0abd generic: update to new logging; fix ssh user bug
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett 8e0b80b015 generic: rename generic-user to generic-ssh-user; update docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett 4e64ff79f9 generic: update for upstream driver specification
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett 94ccd5cd5a generic: remove unneeded config
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett f4c6730539 rebased and updated generic driver for latest driver spec
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Evan Hazlett fb5036e8fd generic: add precreatecheck to driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Evan Hazlett 85dac5440a generic: minor logging update
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Evan Hazlett b3a0a4a882 generic: use SSHPort
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Evan Hazlett 7fc50f3de3 add generic driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Darren Shepherd 8afe967a80 Fix issue where GetIP failes due to no SSH
The main goal of this patch was to make the VirtualBox driver wait for
SSH before trying to get the IP of the VM.  The generic WaitForSSH
method required a Host struct as an arg.  This patch moves most of the
logic to the driver package so that drivers can call WaitForSSH.  The
existing functions in host are just wrappers to the real
implementation in drivers now.

Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-05-05 09:32:45 -07:00
Dave Henderson 6d750d04f1 Fixing panic when d.deviceConfig is nil
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-04 22:13:50 -04:00
Evan Hazlett a5aa222f9f Merge pull request #1101 from hairyhenderson/softlayer-vlan-support-766
Adding SoftLayer support for specifying Public and Private VLAN IDs
2015-05-04 12:35:02 -07:00
Dave Henderson 7c4ba8b560 Adding SoftLayer support for specifying Public and Private VLAN IDs
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-03 22:25:42 -04:00
Dave Henderson bd35fb3101 Fixing bug in GetIP where Public IP would always be returned despite use of --softlayer-private-net-only
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-03 22:14:11 -04:00
Evan Hazlett 6036c28fa5 Merge pull request #1085 from zchee/update-amazonec2-ami
[EC2] Update AMI to release 20150417
2015-05-01 16:40:57 -04:00
Evan Hazlett 6a311b0069 Merge pull request #20 from exoscale/feature/exoscale-support
driver: exoscale driver
2015-05-01 16:31:31 -04:00
zhee 556060f6db Update AMI to release 20150417
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-05-01 10:47:55 +09:00
zhee 8821e7e5ee [EC2] Add Monitoring flag
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-05-01 10:41:47 +09:00
Dave Henderson 3739e4d067 Harmonizing drivers so IPAddress property is kept up-to-date
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-30 19:59:23 -04:00
Vincent Bernat fd569c8fdf driver: exoscale driver
Add support for exoscale, a Swiss cloud provider. This pull "egoscale",
a Go binding for exoscale, in godeps.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-30 22:32:02 +02:00
Nathan LeClaire 142ffadc2c Refactor logging to focus on simple STDOUT/STDERR
This also lays the foundation for the possibility of log drivers in the
future, if it is decided that is a direction to pursue.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-30 12:04:52 -07:00
Evan Hazlett 03c245cf4f Merge pull request #1033 from ehazlett/env-shell-selection
shell selection for env
2015-04-30 14:03:23 -04:00
Evan Hazlett 6e39096962 Merge pull request #1063 from sthulb/ec2-ip
Add --amazonec2-private-address-only
2015-04-30 12:20:17 -04:00
Simon Thulbourn d0651d0273 Add --amazonec2-private-address-only
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-04-30 16:42:44 +01:00
Evan Hazlett 6fe4331fdd
vbox: stop before rm for stability
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-30 10:36:59 -04:00
Evan Hazlett 03c1fbadc5 Merge pull request #1073 from ehazlett/vbox-use-single-core
vbox: use single cpu by default
2015-04-29 14:07:17 -04:00
Evan Hazlett aa5cda2e0b Merge pull request #1072 from ehazlett/gce-fix-instance-refresh
gce: fix for instance not being refreshed on create
2015-04-29 14:06:41 -04:00
Evan Hazlett 9e1185e06e
vbox: use dns pass through
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 12:33:10 -04:00
Evan Hazlett 31b1eb0875 gce: fix for instance not being refreshed on create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:54:08 -04:00
Evan Hazlett e8704b14f1
vbox: use single cpu by default
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:45:33 -04:00
Evan Hazlett 4358113b41 Merge pull request #1025 from jfieber/vboxnat
Virtualbox: move NAT port allocation to machine boot
2015-04-29 09:25:38 -04:00
zhee 5fe9adf881 Update GCE imageName to v20150316
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-04-29 05:34:15 +09:00
John Fieber 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
John Fieber cafad9bb1d Merge remote-tracking branch 'origin/master' into vboxnat
# Conflicts:
#	drivers/virtualbox/virtualbox.go
2015-04-27 10:01:43 -07:00
zhee 7443980c26 Support "--google-disk-type" flag for google driver
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-04-26 04:38:18 +09:00
Sascha Hanse 567e19b8ad unbreak the darwin build, last rebase added some old variable names again
Signed-off-by: Sascha Hanse <shanse@gmail.com>
2015-04-24 21:17:41 +02:00
Evan Hazlett 57c70ef0f1 Merge pull request #956 from knarz/golint_vmware
clean up the vmware drivers
2015-04-24 09:38:09 -07:00
Sascha Hanse 6e0aecb2ee clean up the vmware drivers
Signed-off-by: Sascha Hanse <shanse@gmail.com>

forgot gofmt

Signed-off-by: Sascha Hanse <shanse@gmail.com>
2015-04-23 20:12:07 +02:00
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
Evan Hazlett 191564564e Merge pull request #995 from exoscale/fix/dont-wait-in-drivers
Don't let drivers wait for SSH/Docker/State
2015-04-21 07:31:12 -07:00
Evan Hazlett f64eb09d1c Merge pull request #1034 from frapposelli/fusion-shared-folders
Update VMware Fusion and vSphere driver to run boot2docker 1.6.0
2015-04-21 07:22:15 -07:00
Vincent Bernat 9c71e647ed drivers/softlayer: don't let the driver wait for SSH
Installation of curl is handled directly by libmachine provisioning, so
there is no need to do it and hence wait for SSH to be ready.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
Vincent Bernat fbb8898914 drivers/google: don't wait for SSH to be ready
Waiting for SSH is done in libmachine. There are some additional steps
after waiting for SSH but none of them seem to require SSH to be ready
to be executed.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
Vincent Bernat 3440ba64fa drivers/vcloudair: don't test connectivity
VMWare VCloudAir driver is the only one taking an extra step to test
connectivity after machine creation. If this is a desirable step, it
should be done for all drivers in libmachine directly.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
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 4047c97679 Merge pull request #1009 from hairyhenderson/softlayer-remove-sshkey-on-delete-765
Deleting Machine-generated SSH key from SoftLayer when host is canceled.
2015-04-20 14:00:24 -07:00
Fabio Rapposelli 25583edbb3 Update VMware Fusion and vSphere driver to run boot2docker 1.6.0
- Update custom ISO to docker 1.6.0.
- Shared folder support for VMware Fusion.
- Updated bats test for Fusion.

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-04-20 10:34:13 -07:00
John Fieber 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
John Fieber 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
Rob Smart a625106876 Softlayer driver, correctly store provisioned VM IP address
Fix for Docker Machine gets stuck on IBM Softlayer #915
The ip address of the provisioned VM was not being stored in the driver IPAddress variable, this variable
was being used to check if the VM ssh service was up. However as the variable was a blank string the actual address being checked defaulted
to localhost:22, as a result the installation steps on the VM only worked if the user was running an ssh daemon on the machine they were using docker-machine from.

Signed-off-by: Rob Smart <smartrob@uk.ibm.com>
2015-04-16 13:21:09 +01:00
Dave Henderson 64a844071d Deleting Machine-generated SSH key from SoftLayer when host is canceled.
All the other drivers seem to do this, so I can't imagine this is a bad
idea ;)

Fixes #765

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-15 20:37:24 -04:00
Evan Hazlett 878e37cda6
softlayer: enable local disk in hostspec
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-15 11:03:39 -04:00
Evan Hazlett 460cc02ea5
ec2: update spot instance message
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-14 17:03:38 -04:00
Qicong Chen 9b577aabb6 Supports #226
Signed-off-by: Qicong Chen <qicongchen92@gmail.com>

Fix logging problem

Signed-off-by: Qicong Chen <qicongchen92@gmail.com>
2015-04-14 14:48:27 -04:00
Evan Hazlett 2a93207bd9 Merge pull request #955 from ggiamarchi/keystone_v3_domains
Keystone v3 domains
2015-04-10 16:57:06 -04:00
Evan Hazlett 7b70d83579 Merge pull request #901 from djfarrelly/filter-create-help-cmd
Filter create command flags by driver
2015-04-10 16:20:49 -04:00