Merge pull request #9 from tinnightcap/master

Rename KeyName to SSHKeyName, for nubisproject/nubis-docs#35
nubisproject · Jun 30, 2015 · 31fa285 · 31fa285
2 parents 7a8254d + 45f301d
commit 31fa285
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/nubis/cloudformation/README.md b/nubis/cloudformation/README.md
@@ -14,7 +14,7 @@ Before you deploy with Cloudformation you need to set up your parameters.json fi
     "ParameterValue": "sandbox"
   }, 
   {
-    "ParameterKey": "KeyName",
+    "ParameterKey": "SSHKeyName",
     "ParameterValue": "my_key"
   },
   {
@@ -34,7 +34,7 @@ The ServiceName is the name of this service. For Mozilla deployments this should
 ### Environment
 The environment is one of *sandbox*, *stage* or *prod*. For this (and all manual deployments) you will set this to *sandbox*.
 
-### KeyName
+### SSHKeyName
 This is the name of an existing ssh key that you have either created or uploaded to AWS.
 
 ### TechnicalOwner

diff --git a/nubis/cloudformation/main.json b/nubis/cloudformation/main.json
@@ -17,7 +17,7 @@
       ],
       "ConstraintDescription": "Must specify prod, stage, or sandbox."
     },
-    "KeyName": {
+    "SSHKeyName": {
       "Description": "Existing ssh key to deploy to EC2 instances",
       "Type": "String"
     },
@@ -65,8 +65,8 @@
           "AmiId": {
             "Ref": "AmiId"
           },
-          "KeyName": {
-            "Ref": "KeyName"
+          "SSHKeyName": {
+            "Ref": "SSHKeyName"
           },
           "InstanceType": {
             "Fn::FindInMap": [

diff --git a/nubis/cloudformation/parameters.json-dist b/nubis/cloudformation/parameters.json-dist
@@ -8,7 +8,7 @@
     "ParameterValue": "sandbox"
   }, 
   {
-    "ParameterKey": "KeyName",
+    "ParameterKey": "SSHKeyName",
     "ParameterValue": "key"
   },
   {