Evan Hazlett
1620133970
Merge pull request #1263 from nathanleclaire/remove_top_level_migration
...
Remove flat (0.1.0) => nested (0.2.0) migration code
2015-07-08 16:02:35 -06: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
Jan Broer
c7e9dc7849
libmachine: wait for instance start before polling SSH
...
Signed-off-by: Jan Broer <janeczku@yahoo.de>
2015-05-29 16:54:06 +02:00
Nathan LeClaire
2f831887c6
Remove flat (0.1.0) => nested (0.2.0) migration code
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-28 15:01:55 -07: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
Nathan LeClaire
7f6d19ff47
Fix a few issues with certs
...
- regenerate-certs was busted, because of recent changes I made to
Provision() method
- checksum was different between local certs and remote certs
This PR fixes both issues and adds tests to verify that both conditions
are checked in the future.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-12 15:11:23 -07: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
Nathan LeClaire
e152ecc30b
Add check for machine state before upgrade
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-06 13:20:33 -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
Nathan LeClaire
c602e69448
Read active host from DOCKER_HOST instead of from file
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-04 16:29:04 -07: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
Nathan LeClaire
2574c8ba5d
Implement configurable engine options
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-29 17:58:14 -07:00
Dave Henderson
a0f079a627
Enhancing `docker-machine ip` to support multiple host arguments
...
Fixes #999
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-22 22:10:45 -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
Nathan LeClaire
9b5f395c60
Implement upgrade functionality for boot2docker
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-30 16:18:38 -07:00
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
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
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
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
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