Fix issue85 #87
Merged
Fix issue85 #87
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This addresses use of auto-scaling ODM with the AWS cloud provider. There were 4, docker-machine parameters for the amazonec2 driver that were added to the aws.js config specification including vpc, subnet, iamrole, and zone. Each of these is checked for a value other than an empty string and added to the docker-machine args that are generated. VPC/Subnet are required unless a user has a default VPC/Subnet defined. IAMRole is required to provide ec2 and s3 priv's to the docker-machine instance created as iamrole is not carried forward by the AMI at instance creation. Zone is required in order to build the machine in the same zone as the VPC/Subnet specified.