This repository was archived by the owner on Aug 16, 2021. It is now read-only.
Region param added to nancy run #93
Merged
Conversation
This file contains hidden or 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
added 2 commits
August 21, 2018 19:02
NikolayS
reviewed
Aug 22, 2018
nancy_run.sh
Outdated
| fi | ||
| if [[ -z ${AWS_EC2_TYPE+x} ]]; then | ||
| err "ERROR: AWS EC2 Instance type not given." | ||
| exit 1 | ||
| fi | ||
| if [[ -z ${AWS_REGION+x} ]]; then | ||
| err "ERROR: AWS EC2 region not given." |
There was a problem hiding this comment.
по умолчанию не будем что-то использовать?
There was a problem hiding this comment.
Наш us-east-1 прописать как дефолтный?
NikolayS
reviewed
Aug 22, 2018
nancy_run.sh
Outdated
| @@ -575,6 +582,10 @@ elif [[ "$RUN_ON" == "localhost" ]]; then | |||
| err "ERROR: option '--aws-ebs-volume-size' must be used with '--run on aws'." | |||
| exit 1 | |||
| fi | |||
| if [[ ! -z ${AWS_REGION+x} ]]; then | |||
| err "ERROR: option '--aws-region' must be used with '--run on aws'." | |||
NikolayS
reviewed
Aug 22, 2018
nancy_run.sh
Outdated
| @@ -821,26 +832,26 @@ elif [[ "$RUN_ON" == "aws" ]]; then | |||
| msg "Increased price: $price" | |||
| EC2_PRICE=$price | |||
| if [ -z $zone ]; then | |||
There was a problem hiding this comment.
if [[ -z ${zone+x} ]]; then
?
NikolayS
reviewed
Aug 22, 2018
nancy_run.sh
Outdated
| fi | ||
|
|
||
| create_ec2_docker_machine $DOCKER_MACHINE $AWS_EC2_TYPE $EC2_PRICE \ | ||
| 60 $AWS_KEYPAIR_NAME $AWS_SSH_KEY_PATH $zone; | ||
| 60 $AWS_KEYPAIR_NAME $AWS_SSH_KEY_PATH $AWS_REGION $zone; |
There was a problem hiding this comment.
напомни, что тут 60 означает?
это точно то, что нам надо?
There was a problem hiding this comment.
Это время жизни, теперь задается параметром в #92
NikolayS
reviewed
Aug 22, 2018
nancy_run.sh
Outdated
| @@ -896,10 +907,10 @@ elif [[ "$RUN_ON" == "aws" ]]; then | |||
| # Create new volume and attach them for non i3 instances if needed | |||
| if [ ! -z ${AWS_EBS_VOLUME_SIZE+x} ]; then | |||
| msg "Create and attach a new EBS volume (size: $AWS_EBS_VOLUME_SIZE GB)" | |||
| VOLUME_ID=$(aws ec2 create-volume --size $AWS_EBS_VOLUME_SIZE --region us-east-1 --availability-zone us-east-1a --volume-type gp2 | jq -r .VolumeId) | |||
| VOLUME_ID=$(aws --region=$AWS_REGION ec2 create-volume --size $AWS_EBS_VOLUME_SIZE --availability-zone us-east-1a --volume-type gp2 | jq -r .VolumeId) | |||
There was a problem hiding this comment.
а zone никак не передаём?
There was a problem hiding this comment.
и как --availability-zone us-east-1a сочетается с $AWS_REGION, если оно ($AWS_REGION) не us-east-1?
NikolayS
reviewed
Aug 22, 2018
startupturbo
approved these changes
Aug 23, 2018
NikolayS
reviewed
Aug 23, 2018
nancy_run.sh
Outdated
| exit 1 | ||
| fi | ||
| if [[ "$AWS_BLOCK_DURATION" != "0" ]]; then | ||
| err "ERROR: option '--aws-block-duration' must be used with '--run on aws'." |
NikolayS
pushed a commit
that referenced
this pull request
Sep 18, 2018
Region param added to nancy run
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.