fix(bootstrap): Merge pull request #4 from Cosmic9Studios/bootstrap-p…

…atch fix(bootstrap): Bootstrap only now applied to server
Cosmic9Studios · Oct 18, 2019 · 3112bdd · 3112bdd
2 parents 259744e + 0288b4b
commit 3112bdd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/client.tf b/client.tf
@@ -60,8 +60,8 @@ resource "google_compute_instance_template" "client" {
   }
 
   metadata_startup_script = <<EOT
-    sudo pm2 start /scripts/nomad.sh --wait-ready --listen-timeout 15000 -- ${var.client_target_size}
-    sudo pm2 start /scripts/consul.sh --wait-ready --listen-timeout 15000 -- ${var.client_target_size}
+    sudo pm2 start /scripts/nomad.sh --wait-ready --listen-timeout 15000
+    sudo pm2 start /scripts/consul.sh --wait-ready --listen-timeout 15000
   EOT
 }
 

diff --git a/packer/salt/files/consul.sh b/packer/salt/files/consul.sh
@@ -1 +1 @@
-consul agent -config-dir=/etc/consul.d -ui -ui-content-path /consul/ -bootstrap-expect $1
+consul agent -config-dir=/etc/consul.d -ui -ui-content-path /consul/ $1
diff --git a/packer/salt/files/nomad.sh b/packer/salt/files/nomad.sh
@@ -1 +1 @@
-nomad agent -config=/etc/nomad.d -bootstrap-expect=$1
+nomad agent -config=/etc/nomad.d $1
diff --git a/server.tf b/server.tf
@@ -25,8 +25,8 @@ resource "google_compute_instance_template" "server" {
   }
 
   metadata_startup_script = <<EOT
-    sudo pm2 start /scripts/nomad.sh -- ${var.server_target_size}
-    sudo pm2 start /scripts/consul.sh -- ${var.server_target_size}
+    sudo pm2 start /scripts/nomad.sh -- -bootstrap-expect=${var.server_target_size}
+    sudo pm2 start /scripts/consul.sh -- -bootstrap-expect ${var.server_target_size}
   EOT
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		consul agent -config-dir=/etc/consul.d -ui -ui-content-path /consul/ -bootstrap-expect $1
		consul agent -config-dir=/etc/consul.d -ui -ui-content-path /consul/ $1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		nomad agent -config=/etc/nomad.d -bootstrap-expect=$1
		nomad agent -config=/etc/nomad.d $1