Commit Graph

1242 Commits

Author SHA1 Message Date
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
Evan Hazlett f3bcda1cff Merge pull request #1137 from nathanleclaire/fixup
Fix formatting and non-returning of error
2015-05-07 11:52:40 -07:00
Evan Hazlett 782e3aac11 Merge pull request #1135 from frapposelli/fusion-cpu-fix
CPU count fixes to `vmwarefusion`
2015-05-07 11:52:09 -07:00
Nathan LeClaire 9196d3e1d4 Fix up some whitespace nits
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-07 10:12:21 -07:00
Nathan LeClaire 8887ca2fed Fix formatting and non-returning of error
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-06 17:52:29 -07:00
Fabio Rapposelli 13c1006f3b CPU count fixes to `vmwarefusion`
- Added `--vmwarefusion-cpu-count` parameter
- Defaults to 1 Virtual CPU

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-05-07 02:16:20 +02:00
Evan Hazlett d97dfa69f9 Merge pull request #1131 from nathanleclaire/ssh_timeout
Add retries for SSH dial timeout
2015-05-06 16:13:20 -07:00
Evan Hazlett 6d784fb2fb Merge pull request #1133 from nathanleclaire/fix_upgrade_need_started
Add check for machine state before upgrade
2015-05-06 16:10:49 -07:00
Evan Hazlett 7aa8364a4a Merge pull request #1117 from ehazlett/fix-windows-shell-detection
windows: fix shell detection to not bail on bash envs
2015-05-06 15:54:37 -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
Evan Hazlett 5adfb8b3f0
provisioner: update metadata before install or upgrade
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-06 13:18:46 -07:00
Nathan LeClaire aa6325dadb Add retries for SSH dial timeout
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-06 12:59:46 -07:00
Evan Hazlett ce0e365e10 Merge pull request #1130 from nathanleclaire/fix_quiet_ls
Fix bug with quiet ls mode
2015-05-06 12:55:21 -07:00
Nathan LeClaire 8c34f80940 Fix bug with quiet ls mode
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-06 11:48:16 -07:00
Evan Hazlett c3f15e9c3e Merge pull request #1120 from nathanleclaire/fix_b2d_upgrade
Fix Windows ISO rename issue
2015-05-06 11:26:15 -07:00
Nathan LeClaire cfcd0a75dd Fix Windows ISO rename issue
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-05 15:00:55 -07:00
Evan Hazlett a5bee2996f Merge pull request #1121 from nathanleclaire/skip_build
Add environment variable option to skip docker build in script/build
2015-05-05 14:46:53 -07:00
Nathan LeClaire f1c7577f82 Add environment variable option to skip docker build
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-05 14:39:13 -07:00
Evan Hazlett 3b0a32f6d8 Merge pull request #1118 from nathanleclaire/fix_env
Fix failing env validation
2015-05-05 14:33:08 -07:00
Aaron Huslage bdf01d33c4 Generate more generic certificates that can have other uses.
Added `Digital Signature, Key Encipherment, Key Agreement` Key Usage values.

Signed-off-by: Aaron Huslage <aaron@docker.com>
2015-05-05 16:53:23 -04:00
Nathan LeClaire 6bb56f91d3 Fix failing env validation
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-05 13:51:22 -07:00
Evan Hazlett a7d63161ec Merge pull request #406 from ehazlett/driver-generic
Generic Driver
2015-05-05 13:47:12 -07:00
Evan Hazlett 031e257f9c Merge pull request #993 from ehazlett/windows-vbox-share
Windows vbox share
2015-05-05 12:42:21 -07:00
Evan Hazlett c4dd9198c1
windows: fix shell detection to not bail on bash envs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 12:19:53 -07:00
Evan Hazlett 60be4c292c virtualbox: windows share support
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:31:43 -07:00
Evan Hazlett 10afd2da8a Merge pull request #1107 from hairyhenderson/softlayer-panic
Fixing panic when d.deviceConfig is nil
2015-05-05 11:13:54 -07:00
Evan Hazlett 0060b1cf4b
generic: update docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:10:51 -07:00
Evan Hazlett 9030986a63
generic: pretty struct format
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:08:45 -07:00
Evan Hazlett e9e0fa5cfc
generic: remove unneeded check for ssh user
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:07:45 -07:00
Evan Hazlett e6159ce6c9
generic: reduce wait time for GetState
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:05:47 -07:00
Evan Hazlett fc49adbcdf generic: use ~/.ssh/id_rsa as default ssh key
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett afb9cb39e2 generic: ssh timeout
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett 2d525d0abd generic: update to new logging; fix ssh user bug
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett 8e0b80b015 generic: rename generic-user to generic-ssh-user; update docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett 4e64ff79f9 generic: update for upstream driver specification
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett 94ccd5cd5a generic: remove unneeded config
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Evan Hazlett f4c6730539 rebased and updated generic driver for latest driver spec
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Evan Hazlett fb5036e8fd generic: add precreatecheck to driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Evan Hazlett 85dac5440a generic: minor logging update
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Evan Hazlett b3a0a4a882 generic: use SSHPort
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Evan Hazlett 7fc50f3de3 add generic driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Evan Hazlett fdc8538de4 Merge pull request #1109 from ibuildthecloud/no-default-storage-driver
Default storage driver to "" and let provisioner choose default
2015-05-05 10:46:47 -07:00
Evan Hazlett 6037964cf2 Merge pull request #1104 from ehazlett/version-bump-dev
bump for dev 0.3.0 version
2015-05-05 09:58:43 -07:00
Evan Hazlett ea1569258b Merge pull request #1106 from nathanleclaire/active_integration_tests
Fix integration tests
2015-05-05 09:57:50 -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
Darren Shepherd 43b5786001 Default storage driver to "" and let provisioner choose default
The storage driver will be "" by default an the provisioner must choose
their default provisioner.  If the user chosen storage driver is not
supported the provisioner should return an error.

Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-05-05 09:12:33 -07:00
Dave Henderson 6d750d04f1 Fixing panic when d.deviceConfig is nil
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-04 22:13:50 -04:00
Nathan LeClaire 23f071c76f Fix integration tests
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-04 19:01:29 -07:00
Evan Hazlett 17ae8ff3bf
bump for dev 0.3.0 version
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-04 18:16:58 -07:00
Evan Hazlett e4b6ff1ae9 Merge pull request #1103 from nathanleclaire/active_based_on_env
Read active host from DOCKER_HOST instead of from file
2015-05-04 18:13:48 -07:00