Fix failing aws bastion autoscaling group creation (#42)

* template updates * gitmodules update * Updated submodules * Fix nodecreate syntax error
SolaceProducts · Jun 21, 2019 · 769b74f · 769b74f
1 parent b4def83
commit 769b74f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "submodules/quickstart-aws-vpc"]
 	path = submodules/quickstart-aws-vpc
-	url = [email protected]:aws-quickstart/quickstart-aws-vpc
+	url = [email protected]:aws-quickstart/quickstart-aws-vpc.git
 	branch = master
 [submodule "submodules/quickstart-linux-bastion"]
 	path = submodules/quickstart-linux-bastion
-	url = [email protected]:aws-quickstart/quickstart-linux-bastion
+	url = [email protected]:aws-quickstart/quickstart-linux-bastion.git
 	branch = master
diff --git a/submodules/quickstart-aws-vpc b/submodules/quickstart-aws-vpc
diff --git a/submodules/quickstart-linux-bastion b/submodules/quickstart-linux-bastion
diff --git a/templates/nodecreate.template b/templates/nodecreate.template
@@ -100,52 +100,52 @@
     "Mappings": {
         "AWSAMIRegionMap": {
             "AMI": {
-                "AMZNLINUXHVM": "amzn-ami-hvm-2018.03.0.20180622-x86_64-gp2"
+                "AMZNLINUXHVM": "amzn-ami-hvm-2018.03.0.20181129-x86_64-gp2"
             },
             "ap-northeast-1": {
-                "AMZNLINUXHVM": "ami-9c9443e3"
+                "AMZNLINUXHVM": "ami-00a5245b4816c38e6"
             },
             "ap-northeast-2": {
-                "AMZNLINUXHVM": "ami-ebc47185"
+                "AMZNLINUXHVM": "ami-00dc207f8ba6dc919"
             },
             "ap-south-1": {
-                "AMZNLINUXHVM": "ami-5a8da735"
+                "AMZNLINUXHVM": "ami-0ad42f4f66f6c1cc9"
             },
             "ap-southeast-1": {
-                "AMZNLINUXHVM": "ami-ed838091"
+                "AMZNLINUXHVM": "ami-05b3bcf7f311194b3"
             },
             "ap-southeast-2": {
-                "AMZNLINUXHVM": "ami-33f92051"
+                "AMZNLINUXHVM": "ami-02fd0b06f06d93dfc"
             },
             "ca-central-1": {
-                "AMZNLINUXHVM": "ami-03e86a67"
+                "AMZNLINUXHVM": "ami-07423fb63ea0a0930"
             },
             "eu-central-1": {
-                "AMZNLINUXHVM": "ami-a058674b"
+                "AMZNLINUXHVM": "ami-0cfbf4f6db41068ac"
             },
             "eu-west-1": {
-                "AMZNLINUXHVM": "ami-e4515e0e"
+                "AMZNLINUXHVM": "ami-08935252a36e25f85"
             },
             "eu-west-2": {
-                "AMZNLINUXHVM": "ami-b2b55cd5"
+                "AMZNLINUXHVM": "ami-01419b804382064e4"
             },
             "eu-west-3": {
-                "AMZNLINUXHVM": "ami-d50bbaa8"
+                "AMZNLINUXHVM": "ami-0dd7e7ed60da8fb83"
             },
             "sa-east-1": {
-                "AMZNLINUXHVM": "ami-83d58fef"
+                "AMZNLINUXHVM": "ami-05145e0b28ad8e0b2"
             },
             "us-east-1": {
-                "AMZNLINUXHVM": "ami-cfe4b2b0"
+                "AMZNLINUXHVM": "ami-0080e4c5bc078760e"
             },
             "us-east-2": {
-                "AMZNLINUXHVM": "ami-40142d25"
+                "AMZNLINUXHVM": "ami-0cd3dfa4e37921605"
             },
             "us-west-1": {
-                "AMZNLINUXHVM": "ami-0e86606d"
+                "AMZNLINUXHVM": "ami-0ec6517f6edbf8044"
             },
             "us-west-2": {
-                "AMZNLINUXHVM": "ami-0ad99772"
+                "AMZNLINUXHVM": "ami-01e24be29428c15b2"
             }
         },
         "LinuxAMINameMap": {
+2 −2		README.md
+5 −9		ci/aws-vpc-3az-complete.json
+5 −9		ci/aws-vpc-3az-public.json
+5 −9		ci/aws-vpc-3az.json
+5 −9		ci/aws-vpc-4az-complete.json
+5 −9		ci/aws-vpc-4az-public.json
+5 −9		ci/aws-vpc-4az.json
+5 −9		ci/aws-vpc-complete.json
+74 −0		ci/aws-vpc-dedicated.json
+5 −9		ci/aws-vpc-defaults.json
+5 −9		ci/aws-vpc-public.json
+74 −0		ci/aws-vpc-sa-east-1.json
+14 −4		ci/taskcat.yml
+1,550 −632		templates/aws-vpc.template
+1 −0		.gitignore
+1 −1		.gitmodules
+3 −2		README.md
+6 −2		ci/linux-bastion-master-amznlinuxhvm.json
+54 −0		ci/linux-bastion-master-amznlinuxhvm_dedicatedtenancy.json
+7 −2		ci/linux-bastion-master-centos7hvm.json
+46 −0		ci/linux-bastion-master-sles15hvm.json
+7 −2		ci/linux-bastion-master-us1404hvm.json
+6 −2		ci/linux-bastion-master-us1604hvm.json
+8 −2		ci/taskcat.yml
+255 −376		scripts/bastion_bootstrap.sh
+1 −1		submodules/quickstart-aws-vpc
+42 −9		templates/linux-bastion-master.template
+394 −178		templates/linux-bastion.template