Commit Graph

791 Commits

Author SHA1 Message Date
Nathan LeClaire 33f23be924 Merge pull request #3363 from wadetandy/master
Expose OpenStack driver's userdata param
2016-05-19 14:21:57 -07:00
David Gageot c19d866e25 Merge pull request #3248 from theodthompson/patch-hyperv-check
adding hypervisor check to virtualbox pre-create check
2016-05-12 07:18:12 +02:00
Nathan LeClaire 4e898b1806 Merge pull request #3362 from nathanleclaire/fix_dangling_amazonec2_ssh_key
Ensure that attempt to remove instance and SSH key both go through
2016-04-25 11:48:35 -07:00
Wade Tandy b2e3d81537 Expose OpenStack driver's userdata param
This allows a user to pass a script or cloud-config file that can be
used to initialize the server before the server starts up. This
is particularly useful in enterprise cloud environments where the
available images on openstack might not be fully compatible with the
docker-machine provisioners.

Signed-off-by: Wade Tandy <wtandy@bloomberg.net>
2016-04-22 18:06:09 -04:00
Nathan LeClaire 770d5bbb6f Ensure that attempt to remove instance and SSH key both go through
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-22 15:00:55 -07:00
Nathan LeClaire 008283733e Merge pull request #3330 from bamarni/issue-3268
[Generic] Copy the public key to machine directory (fixes #3268)
2016-04-22 10:58:53 -07:00
Bilal Amarni 9f8f1330c7 [Generic] Copy the public key to machine directory
Keeping an "orphan" private key can have some drawbacks :

http://apple.stackexchange.com/questions/18458/password-dialog-appears-when-ssh-private-key-permissions-are-set-to-0600/26252#26252

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-04-22 10:11:57 +02:00
Nathan LeClaire ee48500fdc Merge pull request #3342 from bamarni/doc-generic-sshagent
[Generic] clarified doc / messages about ssh-agent
2016-04-21 11:03:34 -07:00
Nathan LeClaire a4b432b3a9 Merge pull request #3350 from xyziemba/master
Fix Default Address Space for Azure VNets
2016-04-21 11:02:39 -07:00
Xavier Ziemba 10b2b9f3be Fix Default Address Space for Azure VNets
RFC 1918 specifies 10.0.0.0/8, not 10.0.0.0/6, as part of the private
network address space. This fixes what appears to be a typo.

Signed-off-by: Xavier Ziemba <xy.ziemba@gmail.com>
2016-04-20 16:11:15 -07:00
Vincent Bernat fc9c01f45a exoscale: fix cloud-init file to be compatible with CoreOS
The cloud-init implementation in CoreOS is quite limited and will choke
on `manage_etc_hosts: true`. Use `manage_etc_hosts: localhost` instead
which is supported. This is also supported by the classic Python
cloud-init implementation and the result is quite similar.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2016-04-20 21:23:08 +02:00
Bilal Amarni 90cb223610 [Generic] clarified doc / messages about ssh-agent
As the IdentitiesOnly option is set with the SSH external client,
existing identities in ssh-agent won't be used unless it's the default
location.

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-04-20 11:34:09 +02:00
Markus Bukowski fb4b50112d VMware Fusion: static ip addresses (dhcp) are evaluated
Signed-off-by: Markus Bukowski <me@mrbuk.de>
2016-04-10 18:46:36 +02:00
Nathan LeClaire bc54d366d5 Merge pull request #3269 from ahmetalpbalkan/azure_msg
azure: more accurate messages for resources created
2016-04-04 17:30:17 -07:00
theodthompson b419c5d9ca adding hypervisor check to hyper-v driver
Signed-off-by: Theo Thompson <theot@microsoft.com>
2016-04-04 14:11:28 -07:00
Ahmet Alp Balkan 6c3faf7d05 azure: more accurate messages for resources created
Addresses #3250. We now print 'Configuring' instead of
'Creating' for upsert operations.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-04-03 17:23:29 -07:00
Bilal Amarni 3e3138fcd7 [DigitalOcean] Fix missing identity file error
When using the --digitalocean-ssh-key-fingerprint flag, no SSH key pair
is generated. Keeping the driver's SSHKeyPath option empty makes sure
the ssh client won't perform any validation on the private key.

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-04-02 09:46:19 +02:00
Ahmet Alp Balkan 8a0e6946b5 driver/azure: atomic write for tenant ID file
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-30 13:14:50 -07:00
Ahmet Alp Balkan 500d7d20c5 driver/azure: Performance improvements
Making Azure operation polling intervals more frequent to
detect completions faster (and thus making machine creations
faster).

Reduce one Azure API call for each machine command by caching
the discovered Azure Active Directory tenant ID of the user’s
Azure subscription into a local file. This also makes Azure
driver commands faster.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-30 12:26:23 -07:00
Nathan LeClaire bc89bf5e8d Prevent /var/lib/boot2docker/bootlocal.sh munging on restart
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-03-22 12:22:15 -07:00
Nathan LeClaire 137adfe306 Merge pull request #3214 from exoscale/feature/update-egoscale
exoscale: support for CoreOS
2016-03-22 11:49:39 -07:00
Nathan LeClaire cec812ae2f Merge pull request #3215 from sivel/rackspace-active-timeout
Add --rackspace-active-timeout argument to rackspace driver
2016-03-22 11:49:21 -07:00
Vincent Bernat 05aea83271 exoscale: add support for CoreOS
The egoscale binding for exoscale was limiting the images that could be
selected by a user to Ubuntu one only. Enable the use of arbitrary
images. For example, the following images are now available:

 - centos-6.6
 - centos-7.1
 - coreos-stable-835
 - debian-7
 - debian-8
 - ubuntu-12.04
 - ubuntu-14.04
 - ubuntu-15.10

The default user for non-Ubuntu images are not "ubuntu". Let the user
choose the appropriate user ("core" for CoreOS and "debian" for Debian).

CoreOS user are likely to want the ability to provide custom user data
as it enables the configuration of the etcd cluster. We add an option to
provide custom user data file. Moreover, we remove some of the default
options as they are not supported in CoreOS and are useless on
Debian/Ubuntu:

 - Resizing of rootfs is already done on all images by default.
 - Docker Machine will set the hostname as part of the provisioning.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2016-03-22 08:20:35 +01:00
Nathan LeClaire 593fe2b4d0 Merge pull request #3168 from jtnord/issue-2989
[Issue-2989] Allow non administrators to create docker-machines
2016-03-21 17:31:52 -07:00
James Nord a5da41de6e Allow hyper-v driver to be used from non admin accounts and clean up the fixed disk after convertion.
Signed-off-by: James Nord <jnord@cloudbees.com>
2016-03-21 21:00:53 +00:00
Matt Martz bd5ea7c335 Add --rackspace-active-timeout argument to rackspace driver
Signed-off-by: Matt Martz <matt@sivel.net>
2016-03-21 11:54:17 -05:00
Nathan LeClaire 25672016fa Merge pull request #3194 from ahmetalpbalkan/azure-static-ip
azure: Add --azure-static-public-ip flag
2016-03-15 11:40:11 -07:00
Nathan LeClaire 282fdebeaf Merge pull request #3124 from StefanScherer/set-nictype1
Add flag --virtualbox-nictype to set NIC type of eth0
2016-03-15 11:39:10 -07:00
Ahmet Alp Balkan b898c07ad6 azure: Add --azure-static-public-ip flag
This flag creates Azure VMs with static public IPs that don’t
get released when the VM is deallocated.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-14 21:47:51 -07:00
Nathan LeClaire ef4823f2ac Merge pull request #3159 from ahmetalpbalkan/azure-arm
New Microsoft Azure docker-machine driver
2016-03-14 18:28:51 -07:00
Stefan Scherer f0ac1c00ea Add flag --virtualbox-nictype to set nictype1
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-03-14 22:49:27 +01:00
Ahmet Alp Balkan 44200e7a04 Case-insensitive Azure Resource Provider matching
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-12 18:18:53 -08:00
Nathan LeClaire 67485c60a8 Merge pull request #3165 from paul-callahan/3060-vboxnet-iface-conflict
add code and tests to detect vboxnet collision with host interfaces
2016-03-11 15:52:36 -08:00
Tiago Pires 63ea976b1d FIX #1858 Add engine port
Added flag `--generic-engine-port` to `generic` drive in order to specify other port than `2376` on
Docker engine.
Updated `generic` driver documentation.

Signed-off-by: Tiago Pires <tandrepires@gmail.com>
2016-03-11 13:13:30 +00:00
Ahmet Alp Balkan ce3cb54482 Update default image to Ubuntu 15.10
- Default image now is ubuntu server 15.10. This ensures consistency with
  other cloud drivers.
- Better error message when virtual machine already exists.
- Change default SSH user from `ubuntu` to `docker-user`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-10 16:36:21 -08:00
Paul Callahan 0db41d0a92 add code and tests to detect vboxnet collision with host interfaces
+ exclude existing host-only nets from list of host interfaces
+ interface and mocks for system calls to net.*

Signed-off-by: Paul Callahan <paul.callahan@gmail.com>
2016-03-10 15:05:26 -08:00
Ahmet Alp Balkan 7b96160454 Friendly deprecation notice for old driver VMs
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-09 15:43:49 -08:00
Jeremiah Peschka b800a93f5e Creating distinct Hyper-V and Administrators role checks
Signed-off-by: Jeremiah Peschka <jeremiah.peschka@gmail.com>
2016-03-09 13:53:11 +00:00
Ahmet Alp Balkan ed95f3baab New Microsoft Azure docker-machine driver
The new driver uses Azure Resource Manager APIs and offers a lot
more functionality compared to the old Azure driver. It is also
easier to authenticate and does not require user to create and place
certificate files. It only has a single required argument.

This is a breaking change: The new driver cannot work with machines
created with the older Azure driver and vice versa (as the APIs are
entirely different and resources are not shared between old/new azure
APIs).

The new driver addresses many issues about the azure driver reported
so far.

This resolves #2742, resolves #1368, resolves #1142, resolves #2236,
resolves #2408, resolves #1126, resolves #774.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-07 19:55:51 -08:00
Nathan LeClaire 475053cd7f Merge pull request #3147 from nathanleclaire/fix_nitpick
Fix amazonec2 test nitpicks
2016-03-07 17:13:25 -08:00
Nathan LeClaire 7452cb2c4f Fix amazonec2 test nitpicks
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-03-07 16:45:58 -08:00
Nathan LeClaire f7d4761390 Merge pull request #3140 from SeerUK/master
Updated VMWare Fusion driver to attempt to bind mount the share directory, to fix #2050.
2016-03-07 16:45:19 -08:00
Nathan LeClaire 4d68c92a78 Merge pull request #3158 from tyrken/vsphere-port-default
Default to port 443 for all vsphere actions, not just creation
2016-03-07 15:20:37 -08:00
Ahmet Alp Balkan b53f020c90 Remove azure driver temporarily
This commit temporarily removes Azure driver and its dependencies
from the source tree and adds dependencies for the new Azure driver
(so that Azure driver PR will not have godeps changes and will be
easier to review).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-07 13:34:09 -08:00
Tristan Keen 1b919459e8 Default to port 443 for all vsphere actions, not just creation
Signed-off-by: Tristan Keen <tristan.keen@gmail.com>
2016-03-07 21:31:27 +00:00
Nathan LeClaire 1a0a740e27 Merge pull request #3111 from jsirois/jsirois/amazoneec2/multiple_sgs
Support multiple `--amazonec2-security-group`s.
2016-03-04 11:48:49 -08:00
Bilal Amarni 17c6578583 [DigitalOcean] Allow to use an existing SSH key (closes #1445)
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-03-03 10:35:32 +01:00
John Sirois 494ba5f010 Support multiple `--amazonec2-security-group`s.
Maintains support for loading old Driver config.json that use the
singular `SecurityGroupName` field, but also adds a new plural
`SecurityGroupNames` field.

This change also bumps to latest stretchr/testify, in the course of
adding a dep on stretchr/testify/mock to help test the modified
`configureSecurityGroups` code.

The unused `deleteSecurityGroup` is dropped as well.

Signed-off-by: John Sirois <john.sirois@gmail.com>
Signed-off-by: Bill Farner <terasurfer@gmail.com>
2016-03-02 23:30:28 -07:00
Elliot Wright ced43e8a09 Updated VMWare Fusion driver to attempt to bind mount the share directory, to fix #2050.
Signed-off-by: Elliot Wright <elliot@elliotwright.co>
2016-03-02 14:37:35 +00:00
Jason Roehm 6789c51b83 Google driver: add `--google-use-internal-ip-only` flag
This addresses previously-closed issue #2876, which points out that
instances created with the `--google-use-internal-ip` command-line flag
are still assigned an external IP address. The new flag (which implies
the presence of `--google-use-internal-ip` if it isn't specified) will
cause the new instance to have no externally-accessible IP address.

Signed-off-by: Jason Roehm <jroehm@gmail.com>
2016-03-01 12:41:19 -05:00