Commit Graph

776 Commits

Author SHA1 Message Date
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
Evan Hazlett aeb89ffc3c Merge pull request #853 from ehazlett/docs-version-info
docs: update dockerfile for new version package
2015-03-23 11:43:37 -04:00
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 8040076cc8
docs: update dockerfile for new version package
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-23 11:41:42 -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
Ken Pepple 81a9765d35 add pause/savestate scnearios to virtualbox integration tests
Signed-off-by: Ken Pepple <ken@solinea.com>
2015-03-21 13:13:54 -07: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