Commit Graph

749 Commits

Author SHA1 Message Date
Ash Wilson
cab014cd28 Prepend a string to the User-Agent.
For both OpenStack and Rackspace drivers.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-03-23 11:42:24 -04:00
Evan Hazlett
b438525ebf Merge pull request #834 from knarz/remove_todo_from_docs
remove lingering TODO note from docs
2015-03-23 11:33:26 -04:00
Sascha Hanse
3b622cdde1 remove lingering TODO note from docs
Signed-off-by: Sascha Hanse <shanse@gmail.com>
2015-03-22 17:15:31 +01:00
Evan Hazlett
5c5fc37bc5 Merge pull request #825 from ehazlett/git-commit-version
Git commit version info
2015-03-21 22:30:55 -04:00
Evan Hazlett
3392671988 Merge pull request #827 from nathanleclaire/libmachine_provision_merge
Add provisioning based on OS
2015-03-21 22:29:57 -04:00
Evan Hazlett
c6d1b6d144 Merge pull request #830 from ehazlett/changelog-update
update changelog
2015-03-21 14:20:43 -04:00
Evan Hazlett
74af687d44 update changelog
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-21 14:20:07 -04:00
Nathan LeClaire
3b2c8f9845 Migrate (swarmConfig) => (swarmOptions)
and (SwarmConfig) => (SwarmOptions)

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Migrate (authConfig) => (authOptions)
        (AuthConfig) => (AuthOptions)

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Migrate (hostConfig) => (hostOptions)
        (HostConfig) => (HostOptions)

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 23:20:11 -07:00
Nathan LeClaire
04f5679e4f Add test for validation
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 21:47:11 -07:00
Nathan LeClaire
d91d777f6e Merge pull request #2 from ehazlett/provision-updates
provisioner: migration functions
2015-03-20 21:11:24 -07:00
Evan Hazlett
68397cfced bats updates
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-20 23:44:22 -04:00
Evan Hazlett
28789604e9 provisioner: finished migration functions
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-20 23:17:42 -04:00
Nathan LeClaire
263c802d34 Fix missing test files
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 17:05:27 -07:00
Nathan LeClaire
d189baf36c Move fakedriver to its own module for reuse
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 16:48:47 -07:00
Nathan LeClaire
73862e863c Update tests to work with new provisioning
Also, comment provisioner interface slightly better.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 16:30:46 -07:00
Nathan LeClaire
7b5c8a023f Clean up some remaining issues with libmachine merge
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 16:30:46 -07:00
Nathan LeClaire and Simon Thulborn
49feb33457 Implement majority of provisioning changes
Signed-off-by: Simon Thulborn <simon+github@thulborn.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 16:30:46 -07:00
Evan Hazlett
d8bd18d3bb add git commit to version info
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-20 14:41:48 -04:00
Evan Hazlett
8d5a59b43e Merge pull request #767 from ehazlett/internal-api
Create internal library to use instead of directly using store and host
2015-03-20 14:36:29 -04:00
Evan Hazlett
a4832dcfb5 global options not set when using vars
When using a custom storage-path the TLS certs are not updated.
This adds a new function to query them from the action.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-20 11:52:18 -04:00
Evan Hazlett
7594ac5a2c cleanup unused hyperv file
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-20 00:14:36 -04:00
Evan Hazlett
d770ea55f3 Merge branch 'libmachine-validate-host-config' into internal-api 2015-03-20 00:10:12 -04:00
Evan Hazlett
abd43e8d18 fix storage-path bug
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-20 00:08:58 -04:00
Evan Hazlett
4ca4a28788 libmachine: validate host config upon load
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 23:19:35 -04:00
Evan Hazlett
fe912ae55a fixed bug with storage-path
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 23:19:13 -04:00
Evan Hazlett
5a86bad5fe libmachine: updated tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:53:13 -04:00
Evan Hazlett
e4a37a8e2a Merge pull request #821 from ehazlett/godep-update
godep: fix upstream errors; update naturalsort
2015-03-19 18:09:30 -04:00
Evan Hazlett
d4b3fd4a39 godep: fix upstream errors; update naturalsort
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Evan Hazlett
84c1d10a95 update tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Evan Hazlett
1691d19c9d libmachine: split swarm and engine options
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Evan Hazlett
31b63a1204 libmachine: add engine and swarm options
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Evan Hazlett
56b229a767 update changelog with internal api info
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Evan Hazlett
27be8cf28e initial pass at internal api
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Evan Hazlett
b9043e370d godep: fix upstream errors; update naturalsort
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 16:18:22 -04:00
Evan Hazlett
7a336225e1 Merge pull request #815 from ehazlett/vbox-restart-stopped
vbox: fix issue where could not restart a stopped instance
2015-03-19 15:58:58 -04:00
Evan Hazlett
407f75d109 Merge pull request #816 from ehazlett/changelog-updates
update changelog
2015-03-19 10:25:45 -04:00
Evan Hazlett
bd9816ad0e update changelog
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 10:25:11 -04:00
Evan Hazlett
1f84966dc5 Merge pull request #814 from hairyhenderson/revert-811-revert-783
un-revert "Fixing `config` and `env` bad handling of paths with spaces"
2015-03-19 10:06:05 -04:00
Dave Henderson
3dfc436e07 Revert "revert "Fixing config and env bad handling of paths with spaces""
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-19 10:03:42 -04:00
Evan Hazlett
46e187669f Merge pull request #804 from hairyhenderson/machine-env-docs-762
docs: Normalizing `docker-machine config` references to `docker-machine env`
2015-03-19 10:01:47 -04:00
Dave Henderson
ef37a157fc --tls is now --tlsverify
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-19 09:55:20 -04:00
Evan Hazlett
e1a35bb267 vbox: fix issue where could not restart a stopped instance
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 09:53:40 -04:00
Dave Henderson
7bcb85f9a9 More tweaks - making sure eval is mentioned
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-19 09:44:23 -04:00
Evan Hazlett
703ea4b497 Merge pull request #811 from ehazlett/revert-783
revert "Fixing `config` and `env` bad handling of paths with spaces"
2015-03-18 22:13:57 -04:00
Evan Hazlett
e781ae7269 revert "Fixing config and env bad handling of paths with spaces"
This causes a regression when using with the Docker CLI:

FATA[0000] Couldn't read ca cert
"/home/ehazlett/.docker/machine/machines/dev"/ca.pem

This reverts commit 3c57799534.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-18 22:10:07 -04:00
Evan Hazlett
c63072c42a Merge pull request #810 from ehazlett/changelog-updates
changelog: updated for 0.2.0 release
2015-03-18 21:57:55 -04:00
Evan Hazlett
38e060bc4a changelog: updated for 0.2.0 release
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-18 21:57:07 -04:00
Dave Henderson
022b18f350 docs: Normalizing docker-machine config references to docker-machine env
Fixes #762

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-18 12:37:31 -04:00
Evan Hazlett
46ea081f70 Merge pull request #625 from databus23/b2d_proxy_env
respect proxy settings for b2d downloads
2015-03-18 12:02:17 -04:00
Evan Hazlett
a0b0fd33bb Merge pull request #783 from hairyhenderson/env-config-quoted-paths-781
Fixing `config` and `env` bad handling of paths with spaces
2015-03-18 11:41:40 -04:00