Removing reference to Master in favor of seed

Author: tonynv

scripts/vault-upstart.conf

@@ -1,5 +1,4 @@
-description "Vault"
-
+\description "Vault"
 start on runlevel [2345]
 stop on runlevel [!2345]
 
@@ -8,15 +7,7 @@ respawn
 console log
 
 script
-  if [ -f "/etc/service/vault" ]; then
-    . /etc/service/vault
-  fi
-
   # Make sure to use all our CPUs, because Vault can block a scheduler thread
   export GOMAXPROCS=`nproc`
-
-  exec /usr/local/bin/vault server \
-    -config="/etc/vault.d/vault.hcl" \
-    \$${VAULT_FLAGS} \
-    >>/var/log/vault.log 2>&1
+     vault server -config /etc/vault.d/vault.hcl
 end script

scripts/vault.hcl

@@ -1,5 +1,5 @@
 backend "consul" {
-  address = "__CONSULMASTER__:8500"
+  address = "__CONSULSEED__:8500"
   path = "vault/"
 }
 

templates/quickstart-hashicorp-vault-master.template

@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "Hashicorp Consul+Vault template master, License: Apache 2.0 (Please do not remove) Oct,27,2016",
+  "Description": "Hashicorp Consul+Vault template seed, License: Apache 2.0 (Please do not remove) Oct,27,2016",
   "Metadata": {
     "AWS::CloudFormation::Interface": {
       "ParameterGroups": [{
@@ -499,10 +499,10 @@
                     "Outputs.VPCID"
                 ]
             },
-            "ConsulMasterPrivateIP": {
+            "ConsulSeedPrivateIP": {
                 "Fn::GetAtt": [
                     "HashiCorpConsulStack",
-                    "Outputs.ConsulMasterPrivateIP"
+                    "Outputs.ConsulSeedPrivateIP"
                 ]
             },
             "VPCCIDR": {

templates/quickstart-hashicorp-vault.template

@@ -81,10 +81,10 @@
             "Description": "ID of the private subnet 2 in Availability Zone 2 (e.g., subnet-xxxxxxxx)",
             "Type": "AWS::EC2::Subnet::Id"
         },
-        "ConsulMasterPrivateIP": {
+        "ConsulSeedPrivateIP": {
             "Default": "",
             "Type": "String",
-            "Description": "ConsulMasterPrivateIP"
+            "Description": "ConsulSeedPrivateIP"
         },
         "VPCID": {
             "Description": "VPC ID",
@@ -160,7 +160,7 @@
         "VaultSecGroup": {
             "Type": "AWS::EC2::SecurityGroup",
             "Properties": {
-                "GroupDescription": "Enables SSH access to the Consul Master.",
+                "GroupDescription": "Enables SSH access to the Consul Seed.",
                 "VpcId": {
                     "Ref": "VPCID"
                     },
@@ -427,11 +427,11 @@
                                 " --region ", {
                                     "Ref": "AWS::Region"
                                 }, "\n",
-                                "CONSULMASTER=\"",
+                                "CONSULSEED=\"",
                                 {
-                                  "Ref": "ConsulMasterPrivateIP"
+                                  "Ref": "ConsulSeedPrivateIP"
                                 },"\"\n",
-                                "sed -i -e  s/__CONSULMASTER__/${CONSULMASTER}/ /etc/vault.d/vault.hcl",
+                                "sed -i -e  s/__CONSULSEED__/${CONSULSEED}/ /etc/vault.d/vault.hcl",
                                 "\n",
                                 "echo \"Starting Vault Server \" \n",
                                 "vault server -config /etc/vault.d/vault.hcl",
@@ -631,11 +631,11 @@
                                 " --region ", {
                                     "Ref": "AWS::Region"
                                 }, "\n",
-                                "CONSULMASTER\"=",
+                                "CONSULSEED\"=",
                                 {
-                                  "Ref": "ConsulMasterPrivateIP"
+                                  "Ref": "ConsulSeedPrivateIP"
                                 },"\"\n",
-                                "sed -i -e  s/__CONSULMASTER__/${CONSULMASTER}/ /etc/vault.d/vault.hcl",
+                                "sed -i -e  s/__CONSULSEED__/${CONSULSEED}/ /etc/vault.d/vault.hcl",
                                 "\n",
                                 "echo \"Starting Vault Server \" \n",
                                 "vault server -config /etc/vault.d/vault.hcl",