Commit Graph

802 Commits

Author SHA1 Message Date
Nathan LeClaire a04b908fd3 Implement upgrade for Ubuntu provisioner
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-30 15:23:25 -07:00
Evan Hazlett f010a7bb80 Merge pull request #896 from ggiamarchi/dead_code
Remove dead code
2015-03-30 11:38:48 -04:00
Evan Hazlett ee6e6d76e0 Merge pull request #876 from tombee/virtualbox-env-vars
Added VIRTUALBOX_MEMORY_SIZE and VIRTUALBOX_DISK_SIZE env vars
2015-03-30 10:54:21 -04:00
Evan Hazlett e12540f947 Merge pull request #898 from mtesselH/master
Chagning VirtualBox version to the latest one
2015-03-30 09:27:42 -04:00
Evan Hazlett 2f6f5b9290 Merge pull request #881 from awsmsrc/feature/rm_output
indicate a successful removal of a machine
2015-03-30 09:17:35 -04:00
Evan Hazlett 382f71fdda Merge pull request #907 from ehazlett/roadmap
update roadmap
2015-03-29 01:03:09 -04:00
Evan Hazlett 64de4e80b7
update roadmap
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-29 01:02:23 -04:00
Tom Barlow f17e397d78 Updated docs with environment variables for virtualbox driver
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-28 23:08:46 +00:00
Tom Barlow ddf633a9e4 Rebased, added env var test for virtualbox CPU count
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-28 23:07:49 +00:00
Tom Barlow 6e71cd3917 Replaced export statements in virtualbox integration tests with inline variables
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-28 23:07:49 +00:00
Tom Barlow f01b9ce800 Specifying env vars inline on BATS doesn't seem to work, switched to export
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-28 23:07:49 +00:00
Tom Barlow c221a0a42f Moved cleanup of machine store to end of virtualbox integration test
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-28 23:07:49 +00:00
Tom Barlow 0e1db73829 Added bats integration test for virtualbox customisation via env vars
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-28 23:07:49 +00:00
Tom Barlow 97cd23f2e5 Added VIRTUALBOX_MEMORY_SIZE and VIRTUALBOX_DISK_SIZE env vars
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-28 23:07:48 +00:00
Marianna 77af1bd53d Chagning VirtualBox version to the latest one
Signed-off-by: Marianna <mtesselh@gmail.com>
2015-03-27 16:17:02 -07:00
Luke Roberts 4fd104c530 Remove unnecessary else
Signed-off-by: Luke Roberts <luke@sqwiggle.com>
2015-03-27 13:09:05 -07:00
Evan Hazlett ee7617c2e7 Merge pull request #887 from nathanleclaire/listen_on_socket
Fix unix:// not working inside VM issue
2015-03-27 11:39:45 -07:00
Guillaume Giamarchi fb1362ea05 Remove dead code
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-03-27 19:25:11 +01:00
Evan Hazlett 5c1b941507 Merge pull request #894 from nathanleclaire/fix_docs_typo
Fix small docs typo
2015-03-27 11:20:16 -07:00
Nathan LeClaire 9ca10bc2c0 Fix small docs typo
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-27 10:51:33 -07:00
Nathan LeClaire d6db67d0be Fix unix:// not working inside VM issue
With the way that provisioning was implemented, there was an issue
getting connection to the UNIX socket to work with the new boot2docker
1.6rc2 ISO.  This issue is related to the fact that the docker
service was not truly stopped during the provisioning.  This PR fixes
the issue and provides some tests to help ensure that it does not come
up again.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-27 10:41:12 -07:00
Evan Hazlett e80d086a6d Merge pull request #891 from mattetti/890-doc-improvement
simplify some of the documentation steps
2015-03-27 07:48:46 -07:00
Matt Aimonetti b2661e37f7 simplify some of the steps
Signed-off-by: Matt Aimonetti <mattaimonetti@gmail.com>
2015-03-26 19:34:29 -07:00
Luke Roberts 01f12a6ea0 period for consistency
Signed-off-by: Luke Roberts <luke@sqwiggle.com>
2015-03-25 22:28:27 -07:00
Luke Roberts d410b4b78c indicate a successful removal of a machine
Signed-off-by: Luke Roberts <luke@speak.io>
2015-03-25 22:27:33 -07:00
Evan Hazlett 45f08d9815 Merge pull request #880 from slashk/vb-cpu-tests
add integration tests for cpu count in virtualbox driver
2015-03-25 20:57:41 -07:00
Ken Pepple d80c47df88 add integration tests for cpu count (PR #879) in virtualbox driver
Signed-off-by: Ken Pepple <ken@solinea.com>
2015-03-25 20:40:50 -07:00
Evan Hazlett 62388b0f50 Merge pull request #879 from pbiggar/819-add-virtualbox-cpu-count
Adds virtualbox-cpu-count - fixes #819
2015-03-25 20:23:48 -07:00
Paul Biggar dde614dbb0 Adds virtualbox-cpu-count - fixes #819
Signed-off-by: Paul Biggar <paul.biggar@gmail.com>
2015-03-25 20:06:22 -07:00
Evan Hazlett 5f573a81d4 Merge pull request #856 from slashk/env-hangs-on-stopped-machine
fixes #855 for docker-machine env on stopped machines
2015-03-25 17:59:22 -07:00
Evan Hazlett 93ffb83723 Merge pull request #832 from slashk/no-active-host-ssh-bug
fixes issue #831 and issue #771 by checking for unset machine name
2015-03-25 17:29:52 -07:00
Evan Hazlett 4cc01ee8d6 Merge pull request #872 from nathanleclaire/test_migration
Test migration functions
2015-03-25 17:19:32 -07:00
Ken Pepple be6dcc0905 fixes issue #831 and issue #771 by checking for unset active machine name
Signed-off-by: Ken Pepple <ken@solinea.com>
2015-03-25 13:46:46 -07:00
Evan Hazlett 87f12c3a5c Merge pull request #873 from slashk/issue-843-vb-flags
add integration tests for virtualbox to exercise custom options
2015-03-25 12:55:22 -07:00
Ken Pepple a84cc1ee6b add integration tests for custom create options in virtualbox
Signed-off-by: Ken Pepple <ken@solinea.com>
2015-03-25 12:48:50 -07:00
Nathan LeClaire abc5462c77 Rename migration functions to be more descriptive and add tests
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-25 11:21:09 -07:00
Evan Hazlett 5575c6dc9d Merge pull request #805 from ehazlett/file-support-for-b2d
File support for b2d
2015-03-25 02:53:44 -07:00
Evan Hazlett 8ab5b87379 use file for downloading b2d iso if no scheme is provided
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-24 15:21:15 -07:00
Ke Zhu f92f57cd4d keep global b2d iso cache when using custom b2d iso
Signed-off-by: Ke Zhu <kzhu@us.ibm.com>
2015-03-24 15:21:15 -07:00
Evan Hazlett bde6ad3fac fixed b2d url bug with fusion / vsphere
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-24 15:21:15 -07:00
Evan Hazlett 2151492dec fix regression for custom b2d url paths
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-24 15:21:15 -07:00
Evan Hazlett bc9e5c6a04 Merge pull request #868 from ehazlett/bump-version
update version
2015-03-24 13:19:00 -07:00
Evan Hazlett 2ca203bddf update version
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-24 13:18:13 -07:00
Evan Hazlett aa031ec759 Merge pull request #859 from nathanleclaire/validate_hostname
Fix location of validating hostname functionality
2015-03-24 12:04:13 -07:00
Evan Hazlett d68cbe4164 Merge pull request #780 from smashwilson/set-useragent
Set the User-Agent for OpenStack and Rackspace drivers
2015-03-24 05:17:45 -07:00
Evan Hazlett a9277a7977 Merge pull request #833 from slashk/vbox-pause-saved-int-test
add pause/savestate scnearios to virtualbox integration tests
2015-03-23 20:11:04 -04:00
Evan Hazlett b6bcb9991d Merge pull request #860 from paulczar/openstack_driver_auth_url_typo
quick fix of typo in openstack driver
2015-03-23 20:10:23 -04: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
Nathan LeClaire 9cccc3a147 Fix location of validating hostname functionality
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-23 14:15:09 -07:00
Ken Pepple df70e68b68 fixes #855 for docker-machine env on stopped machines
Signed-off-by: Ken Pepple <ken@solinea.com>
2015-03-23 10:36:48 -07:00