Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelwittig committed Sep 20, 2016
1 parent d67a97c commit 26ac4d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions vpc/vpc-nat-instance.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
}]
}
},
"IAMPolicySSHAccess": {
"NATIAMPolicySSHAccess": {
"Type": "AWS::IAM::Policy",
"Condition": "HasIAMUserSSHAccess",
"Properties": {
Expand Down Expand Up @@ -224,7 +224,7 @@
"Metadata": {
"AWS::CloudFormation::Init": {
"configSets": {
"default": {"Fn::If": ["HasIAMUserSSHAccess", ["config", "ssh-access"], ["config"]]}
"default": {"Fn::If": ["HasIAMUserSSHAccess", ["ssh-access", "config"], ["config"]]}
},
"ssh-access": {
"files": {
Expand Down Expand Up @@ -429,7 +429,7 @@
"SecurityGroups": [{"Ref": "NATSecurityGroup"}],
"KeyName": {"Fn::If": ["HasKeyName", {"Ref": "KeyName"}, {"Ref": "AWS::NoValue"}]},
"UserData": { "Fn::Base64": { "Fn::Join": ["", [
"#!/bin/bash -x","\n",
"#!/bin/bash -x", "\n",
"INSTANCEID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id)", "\n",
"aws --region ", {"Ref": "AWS::Region"}, " ec2 associate-address --instance-id $INSTANCEID --allocation-id ", {"Fn::GetAtt": ["EIP" , "AllocationId"]},
" && aws --region ", {"Ref": "AWS::Region"}, " ec2 modify-instance-attribute --instance-id $INSTANCEID --source-dest-check \"{\\\"Value\\\": false}\"",
Expand Down
2 changes: 1 addition & 1 deletion vpc/vpc-ssh-bastion.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"Metadata": {
"AWS::CloudFormation::Init": {
"configSets": {
"default": {"Fn::If": ["HasIAMUserSSHAccess", ["config", "ssh-access"], ["config"]]}
"default": {"Fn::If": ["HasIAMUserSSHAccess", ["ssh-access", "config"], ["config"]]}
},
"ssh-access": {
"files": {
Expand Down

0 comments on commit 26ac4d7

Please sign in to comment.