ea1569258b
Merge pull request #1106 from nathanleclaire/active_integration_tests
...
Fix integration tests
2015-05-05 09:57:50 -07:00
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
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
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
23f071c76f
Fix integration tests
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-04 19:01:29 -07:00
17ae8ff3bf
bump for dev 0.3.0 version
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-04 18:16:58 -07:00
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
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
9b43da0636
Merge pull request #1098 from ibuildthecloud/generic-provisioner
...
Refactor out common logic in UbuntuProvisioner
2015-05-04 15:55:42 -07:00
a5aa222f9f
Merge pull request #1101 from hairyhenderson/softlayer-vlan-support-766
...
Adding SoftLayer support for specifying Public and Private VLAN IDs
2015-05-04 12:35:02 -07:00
cab881ee16
Merge pull request #1100 from hairyhenderson/softlayer-getip-private-fix-1099
...
Fixing bug in GetIP where Public IP would always be returned
2015-05-04 12:31:49 -07:00
5404b0e447
Merge pull request #1092 from nathanleclaire/doc_filter_flags
...
Add doc about filtering create flags
2015-05-04 12:31:27 -07:00
7c4ba8b560
Adding SoftLayer support for specifying Public and Private VLAN IDs
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-03 22:25:42 -04:00
bd35fb3101
Fixing bug in GetIP where Public IP would always be returned despite use of --softlayer-private-net-only
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-03 22:14:11 -04:00
fc4488a864
Refactor out common logic in UbuntuProvisioner
...
This change create GenericProvisioner which is the boilplate or
generic Linux functionality that was previously in the UbuntuProvisioner
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-05-03 17:21:46 -07:00
d5728a41c5
Add doc about filtering create flags
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-01 14:26:08 -07:00
6036c28fa5
Merge pull request #1085 from zchee/update-amazonec2-ami
...
[EC2] Update AMI to release 20150417
2015-05-01 16:40:57 -04:00
e2d5aca704
Merge pull request #1089 from zchee/docs-update-gce-flags
...
Update docs for GCE flags
2015-05-01 16:37:10 -04:00
6a311b0069
Merge pull request #20 from exoscale/feature/exoscale-support
...
driver: exoscale driver
2015-05-01 16:31:31 -04:00
15fb6c3d79
Merge pull request #1083 from ehazlett/docs-update-env-shell
...
docs: update usage info for env shell options
2015-05-01 16:11:31 -04:00
32948a2bfd
Merge pull request #1087 from nathanleclaire/shell_docs
...
Add doc for env --shell option
2015-05-01 16:10:45 -04:00
71b4bdf152
Merge pull request #1088 from hairyhenderson/inspect-docs-1084
...
Adding docs for the inspect command
2015-05-01 16:09:33 -04:00
7c090a976f
Tweak
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-01 16:04:58 -04:00
2c461bb50f
Merge pull request #1043 from hairyhenderson/driver-ipaddress-property-1041
...
Adding/Renaming IPAddress properties for consistency across drivers
2015-05-01 14:57:15 -04:00
b0ae0edd32
Merge pull request #1080 from nathanleclaire/shorter_store_flag
...
Add short form of --storage-path flag
2015-05-01 14:56:49 -04:00
092521a346
docs: update usage info for env shell options
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-01 14:55:50 -04:00
ef4cccf0b4
Add doc for env --shell option
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-01 11:48:29 -07:00
37594ef88a
Update docs for GCE flags
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-05-01 12:32:56 +09:00
2e85fd32e4
Adding docs for the inspect command
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-30 23:03:37 -04:00
556060f6db
Update AMI to release 20150417
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-05-01 10:47:55 +09:00
8821e7e5ee
[EC2] Add Monitoring flag
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-05-01 10:41:47 +09:00
3739e4d067
Harmonizing drivers so IPAddress property is kept up-to-date
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-30 19:59:23 -04:00
fd569c8fdf
driver: exoscale driver
...
Add support for exoscale, a Swiss cloud provider. This pull "egoscale",
a Go binding for exoscale, in godeps.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-30 22:32:02 +02:00
7dcd4c2dfd
Merge pull request #1008 from nathanleclaire/logging
...
Refactor logging to focus on simple STDOUT/STDERR
2015-04-30 15:42:53 -04:00
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
4e9fc9c248
Add short form of --storage-path flag
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-30 11:50:09 -07:00
03c245cf4f
Merge pull request #1033 from ehazlett/env-shell-selection
...
shell selection for env
2015-04-30 14:03:23 -04:00
a3eb0d077b
Merge pull request #1040 from nathanleclaire/engine_options
...
Implement configurable engine options
2015-04-30 13:55:58 -04:00
6e39096962
Merge pull request #1063 from sthulb/ec2-ip
...
Add --amazonec2-private-address-only
2015-04-30 12:20:17 -04:00
d0651d0273
Add --amazonec2-private-address-only
...
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-04-30 16:42:44 +01:00
798a7a8fe9
Merge pull request #960 from crunchywelch/master
...
for ubuntu provision append hostname to 127.0.1.1 line in /etc/hosts
2015-04-30 11:33:22 -04:00
6fe4331fdd
vbox: stop before rm for stability
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-30 10:36:59 -04:00
49686b9a91
better hint for windows shells
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-30 10:36:38 -04:00
b99e32e819
Merge pull request #1065 from hairyhenderson/reformat-usage-1014
...
Reformatting usage message to look more like docker's
2015-04-30 09:27:13 -04:00
2574c8ba5d
Implement configurable engine options
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-29 17:58:14 -07:00
03c1fbadc5
Merge pull request #1073 from ehazlett/vbox-use-single-core
...
vbox: use single cpu by default
2015-04-29 14:07:17 -04:00
aa5cda2e0b
Merge pull request #1072 from ehazlett/gce-fix-instance-refresh
...
gce: fix for instance not being refreshed on create
2015-04-29 14:06:41 -04:00
f96e93dd00
Merge pull request #1075 from ehazlett/vbox-dns-pass-through
...
vbox: use dns pass through
2015-04-29 14:05:37 -04:00
9e1185e06e
vbox: use dns pass through
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 12:33:10 -04:00
31b1eb0875
gce: fix for instance not being refreshed on create
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:54:08 -04:00
Evan Hazlett
Darren Shepherd
Dave Henderson
Nathan LeClaire
zhee
Dave Henderson
Vincent Bernat
Simon Thulbourn