Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Commit 01e69b0

Browse files
committed
Update UserData: Fix unmatched quote
1 parent d155961 commit 01e69b0

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

scripts/vault.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
backend "consul" {
22
address = "__CONSULMASTER__:8500"
3-
path = "vault"
3+
path = "vault/"
44
}
55

66
listener "tcp" {

templates/quickstart-hashicorp-vault.template

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
"Metadata": {
297297
"AWS::CloudFormation::Init": {
298298
"configSets": {
299-
"vault_install": [ "install_cloudwatch_logs_and_mon_scripts", "install_vault", "run_vault" ]
299+
"vault_install": [ "install_vault", "run_vault", "install_cloudwatch_logs_and_mon_scripts" ]
300300
},
301301
"install_cloudwatch_logs_and_mon_scripts": {
302302
"packages": {
@@ -410,14 +410,13 @@
410410
"Fn::Base64": {
411411
"Fn::Join": [
412412
"", [
413-
"#!/bin/bash -e\n",
413+
"#!/bin/bash -x\n",
414414
"mkdir -p /opt/vault/policies/ /opt/vault/scripts/ /etc/vault.d/\n",
415415
"apt-get -y update\n",
416416
"#install the cfn-init tools\n",
417417
"apt-get -y install python-pip\n",
418418
"pip install pyOpenSSL ndg-httpsclient pyasn1\n",
419419
"easy_install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz\n",
420-
"ln -s /root/aws-cfn-bootstrap-latest/init/ubuntu/cfn-hup /etc/init.d/cfn-hup\n",
421420
"/usr/local/bin/cfn-init",
422421
" --verbose ",
423422
" --stack ", {
@@ -428,7 +427,7 @@
428427
" --region ", {
429428
"Ref": "AWS::Region"
430429
}, "\n",
431-
"CONSULMASTER=",
430+
"CONSULMASTER=\"",
432431
{
433432
"Ref": "ConsulMasterPrivateIP"
434433
},"\"\n",
@@ -502,7 +501,7 @@
502501
"Metadata": {
503502
"AWS::CloudFormation::Init": {
504503
"configSets": {
505-
"vault_install": ["install_cloudwatch_logs_and_mon_scripts", "install_vault", "run_vault"]
504+
"vault_install": [ "install_vault", "run_vault", "install_cloudwatch_logs_and_mon_scripts" ]
506505
},
507506
"install_cloudwatch_logs_and_mon_scripts": {
508507
"packages": {
@@ -615,14 +614,13 @@
615614
"Fn::Base64": {
616615
"Fn::Join": [
617616
"", [
618-
"#!/bin/bash -e\n",
617+
"#!/bin/bash -x\n",
619618
"mkdir -p /opt/vault/policies/ /opt/vault/scripts/ /etc/vault.d/\n",
620619
"apt-get -y update\n",
621620
"#install the cfn-init tools\n",
622621
"apt-get -y install python-pip\n",
623622
"pip install pyOpenSSL ndg-httpsclient pyasn1\n",
624623
"easy_install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz\n",
625-
"ln -s /root/aws-cfn-bootstrap-latest/init/ubuntu/cfn-hup /etc/init.d/cfn-hup\n",
626624
"/usr/local/bin/cfn-init",
627625
" --verbose ",
628626
" --stack ", {
@@ -633,7 +631,7 @@
633631
" --region ", {
634632
"Ref": "AWS::Region"
635633
}, "\n",
636-
"CONSULMASTER=",
634+
"CONSULMASTER\"=",
637635
{
638636
"Ref": "ConsulMasterPrivateIP"
639637
},"\"\n",

0 commit comments

Comments
 (0)