Commit Graph

57 Commits

Author SHA1 Message Date
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
Simon Thulbourn
d0651d0273 Add --amazonec2-private-address-only
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-04-30 16:42:44 +01:00
Vincent Bernat
44be16c49f drivers: don't let the driver wait for SSH/Docker
Waiting for SSH to start or Docker to be available is a step done
directly in the framework (in libmachine). There is no need for the
driver to do that.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
Evan Hazlett
460cc02ea5 ec2: update spot instance message
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-14 17:03:38 -04:00
Qicong Chen
9b577aabb6 Supports #226
Signed-off-by: Qicong Chen <qicongchen92@gmail.com>

Fix logging problem

Signed-off-by: Qicong Chen <qicongchen92@gmail.com>
2015-04-14 14:48:27 -04:00
wlan0
ee941e979b make ssh username configurable for ec2
Signed-off-by: wlan0 <sidharthamn@gmail.com>
2015-04-07 18:00:06 -07:00
Guillaume Giamarchi
fb1362ea05 Remove dead code
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-03-27 19:25:11 +01:00
Evan Hazlett
5403171328 ec2: fix bug where ip address was not updated upon restart
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-17 11:08:20 -04:00
Evan Hazlett
bc6b66c122 drivers: specify defaults if values are missing; i.e. config updates
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-11 22:59:28 -04:00
Evan Hazlett
645bf8ab90 amazonec2: add SSHUser to driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-11 22:04:52 -04:00
Evan Hazlett
3347d1e82f rename HypervisorType to ProviderType
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 16:03:36 -04:00
Evan Hazlett
c76d1a253f revert to GetSSHHostname based on feedback from @nathanleclaire
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 15:55:18 -04:00
Evan Hazlett
0577f66f5d initial work to get amazonec2 and none drivers to upgrade driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 12:50:40 -04:00
Evan Hazlett
b8ef936e90 add AuthorizePort and DeauthorizePort
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 10:50:48 -04:00
Nathan LeClaire
1e983d5ff6 Introduce universal poll retries function
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-04 16:41:48 -08:00
Nathan LeClaire
8d0bf21c6d Fix panic when instance doesn't exist remotely
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-03 14:48:04 -08:00
Nathan LeClaire
a7d1a70442 Fix IP address not being set correctly due to race
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-03 14:47:06 -08:00
Evan Hazlett
5f01d4cda5 Merge pull request #449 from sthulb/aws-assign-roles
IRC Req: EC2 IAM Instance Profile
2015-03-02 17:12:27 -05:00
Simon Thulbourn
2ce70bf5ac adds the ability to set an instance role for ec2 instances
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-03-02 19:01:22 +00:00
Evan Hazlett
f0c70ee8ed ec2: do not try to auth swarm port if exists
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-02 13:14:41 -05:00
Evan Hazlett
10b3d7fd9a ec2: remove unneeded subnetid var
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-27 18:08:33 -05:00
Evan Hazlett
32ed441fbb ec2: use filters for GetSubnets; check subnetId in PreCreate for driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-27 16:51:48 -05:00
Evan Hazlett
19f5b0cb54 ec2: check subnet exists in vpc
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-27 15:31:48 -05:00
Andy Watson
0d83d89dd2 PR updates
Signed-off-by: Andy Watson <andrewmoorewatson@gmail.com>
2015-02-26 23:26:23 -05:00
Andrew Watson
dac96263be Fix #629 by adding PrivateIPAddress to config.json
Signed-off-by: Andrew Watson <andrew@ionicsecurity.com>
2015-02-26 14:53:36 -05:00
Evan Hazlett
54f36078f4 do not show debug for docker install by default; refactor install out of drivers
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-23 17:14:32 -05:00
Andrew Watson
9ff6dbe0b2 Fixes #576 by return the err
Signed-off-by: Andrew Watson <andrewmoorewatson@gmail.com>
2015-02-21 00:15:47 -05:00
Evan Hazlett
3a3ef6f45e add discovery to machine config; show swarm membership
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett
a949e12b6e store swarm config in driver; vendor Godeps; generate swarm token
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett
4e95c2760f authorize swarm port when master is in ec2; fix max dns name for azure
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:20 -08:00
Evan Hazlett
557d03a849 tls fixes to support swarm; test updates; improved provisioning logging
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:20 -08:00
Jamie Furness
d1ccb16a5c Need to sudo to install the package as well as perform update.
Signed-off-by: Jamie Furness <jamie@jamierf.co.uk>
2015-02-11 15:35:38 +00:00
Evan Hazlett
47bef782fa Merge pull request #401 from ehazlett/ec2-check-existing-keypair
add PreCreateCheck; check for existing ec2 keypair
2015-01-26 12:35:56 -05:00
Evan Hazlett
57810b298d This adds a method to the Driver: PreCreateCheck. This can be used
where you want to run some prerequisite checks before attempting to
create
the machine.  In the case of EC2, this is a check for an existing
keypair.  This can be used in the other drivers in the future as well.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-26 11:27:12 -05:00
Simon Thulbourn
8482c7201f Adds region defaults
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-26 16:17:18 +00:00
Evan Hazlett
9178f518e8 Merge pull request #391 from ehazlett/ec2-use-single-sg
Create / Re-use existing EC2 security group
2015-01-26 11:12:18 -05:00
Evan Hazlett
75f79ed25e use ubuntu 14.04 for remaining drivers
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-23 17:08:29 -05:00
Evan Hazlett
c25592000b update docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-23 00:32:27 -05:00
Evan Hazlett
834fa414b4 allow specifying sg; re-use existing sg; fix race conditions with ip assigning and eventual consistency with sgs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-22 16:47:53 -05:00
Evan Hazlett
85f1cb9725 only authorize ec2 group if needed
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-22 16:47:52 -05:00
Evan Hazlett
ff1e232d83 use single group for ec2
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: use single sg

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-22 16:47:52 -05:00
Evan Hazlett
fc2e5f278b configure opts for b2d
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
4a47ce01fe updated google driver; added StartDocker and StopDocker to driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
4534944f6a use tls for auth
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
c2f1fea9dc Merge pull request #219 from sthulb/hostnames
Hostnames
2015-01-14 09:31:43 -05:00
Simon Thulbourn
a70e8462cb adds support for AWS IAM roles
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-13 18:16:43 +00:00
Simon Thulbourn
861b16dba9 add machine name to VM name and hostname
This work sets the machine name in the Cloud API or Hypervisor. As well
as setting the hostname inside the VM.

I've added the machine name to the NewDriver func to allow for
identification by Cloud APIs and for the driver package.

Each driver will attempt to set the hostname for the VM, except for
Azure, which sets it based on the DNS name.

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-12 16:46:00 +00:00
Evan Hazlett
a9ff2857ee listen on socket in addition to tls for amazon driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-01 20:50:41 -05:00
Evan Hazlett
41644ceaac use 1.4.1 identity build
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2014-12-31 01:09:21 -05:00
Evan Hazlett
74328e113a add env vars for amazonec2 driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2014-12-19 10:25:03 -05:00