Commit Graph

17 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
27be8cf28e initial pass at internal api
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00