adding region (rancher#262)

aganesh-suse · web-flow · commit 78ad3dc4cf4e · 2025-07-28T14:55:58.000-07:00
diff --git a/modules/k3s/master/instances_server.tf b/modules/k3s/master/instances_server.tf
@@ -91,7 +91,7 @@ resource "aws_instance" "master" {
     ]
   }
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "file" {
     source      = "../install/node_role.sh"
@@ -134,7 +134,7 @@ resource "aws_instance" "master" {
     ]
   }
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "remote-exec" {
     inline = [
@@ -256,7 +256,7 @@ resource "aws_instance" "master2-ha" {
     ]
   }
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "file" {
     source      = "../install/node_role.sh"
@@ -300,7 +300,7 @@ resource "aws_instance" "master2-ha" {
     ]
   }
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "remote-exec" {
     inline = [ <<-EOT
diff --git a/modules/k3s/worker/instances_worker.tf b/modules/k3s/worker/instances_worker.tf
@@ -32,7 +32,7 @@ resource "aws_instance" "worker" {
   }
 
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "file" {
     source               = "../install/join_k3s_agent.sh"
@@ -50,7 +50,7 @@ resource "aws_instance" "worker" {
   }
 
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "remote-exec" {
     inline = [
diff --git a/modules/rke2/master/instances_server.tf b/modules/rke2/master/instances_server.tf
@@ -102,7 +102,7 @@ resource "aws_instance" "master" {
     ]
   }
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "file" {
     source      = "../install/optional_write_files.sh"
@@ -136,7 +136,7 @@ resource "aws_instance" "master" {
     ]
   }
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "remote-exec" {
     inline = [<<-EOT
@@ -245,7 +245,7 @@ resource "aws_instance" "master2-ha" {
     ]
   }
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "file" {
     source      = "../install/optional_write_files.sh"
@@ -279,7 +279,7 @@ resource "aws_instance" "master2-ha" {
     ]
   }
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "remote-exec" {
     inline = [<<-EOT
diff --git a/modules/rke2/worker/instances_worker.tf b/modules/rke2/worker/instances_worker.tf
@@ -48,7 +48,7 @@ resource "aws_instance" "worker" {
     ]
   }
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "file" {
     source = "../install/join_rke2_agent.sh"
@@ -62,7 +62,7 @@ resource "aws_instance" "worker" {
     ]
   }
   provisioner "local-exec" {
-    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 || exit 0"
+    command = "echo \"${var.node_os}\" | grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 || exit 0"
   }
   provisioner "remote-exec" {
     inline = [<<-EOT

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ resource "aws_instance" "master" {`
`91`	`91`	`]`
`92`	`92`	`}`
`93`	`93`	`provisioner "local-exec" {`
`94`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`94`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`95`	`95`	`}`
`96`	`96`	`provisioner "file" {`
`97`	`97`	`source = "../install/node_role.sh"`
`@@ -134,7 +134,7 @@ resource "aws_instance" "master" {`
`134`	`134`	`]`
`135`	`135`	`}`
`136`	`136`	`provisioner "local-exec" {`
`137`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`137`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`138`	`138`	`}`
`139`	`139`	`provisioner "remote-exec" {`
`140`	`140`	`inline = [`
`@@ -256,7 +256,7 @@ resource "aws_instance" "master2-ha" {`
`256`	`256`	`]`
`257`	`257`	`}`
`258`	`258`	`provisioner "local-exec" {`
`259`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`259`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`260`	`260`	`}`
`261`	`261`	`provisioner "file" {`
`262`	`262`	`source = "../install/node_role.sh"`
`@@ -300,7 +300,7 @@ resource "aws_instance" "master2-ha" {`
`300`	`300`	`]`
`301`	`301`	`}`
`302`	`302`	`provisioner "local-exec" {`
`303`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`303`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`304`	`304`	`}`
`305`	`305`	`provisioner "remote-exec" {`
`306`	`306`	`inline = [ <<-EOT`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ resource "aws_instance" "worker" {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`provisioner "local-exec" {`
`35`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`35`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`36`	`36`	`}`
`37`	`37`	`provisioner "file" {`
`38`	`38`	`source = "../install/join_k3s_agent.sh"`
`@@ -50,7 +50,7 @@ resource "aws_instance" "worker" {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`provisioner "local-exec" {`
`53`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`53`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`54`	`54`	`}`
`55`	`55`	`provisioner "remote-exec" {`
`56`	`56`	`inline = [`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ resource "aws_instance" "master" {`
`102`	`102`	`]`
`103`	`103`	`}`
`104`	`104`	`provisioner "local-exec" {`
`105`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`105`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`106`	`106`	`}`
`107`	`107`	`provisioner "file" {`
`108`	`108`	`source = "../install/optional_write_files.sh"`
`@@ -136,7 +136,7 @@ resource "aws_instance" "master" {`
`136`	`136`	`]`
`137`	`137`	`}`
`138`	`138`	`provisioner "local-exec" {`
`139`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`139`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`140`	`140`	`}`
`141`	`141`	`provisioner "remote-exec" {`
`142`	`142`	`inline = [<<-EOT`
`@@ -245,7 +245,7 @@ resource "aws_instance" "master2-ha" {`
`245`	`245`	`]`
`246`	`246`	`}`
`247`	`247`	`provisioner "local-exec" {`
`248`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`248`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`249`	`249`	`}`
`250`	`250`	`provisioner "file" {`
`251`	`251`	`source = "../install/optional_write_files.sh"`
`@@ -279,7 +279,7 @@ resource "aws_instance" "master2-ha" {`
`279`	`279`	`]`
`280`	`280`	`}`
`281`	`281`	`provisioner "local-exec" {`
`282`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`282`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`283`	`283`	`}`
`284`	`284`	`provisioner "remote-exec" {`
`285`	`285`	`inline = [<<-EOT`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ resource "aws_instance" "worker" {`
`48`	`48`	`]`
`49`	`49`	`}`
`50`	`50`	`provisioner "local-exec" {`
`51`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`51`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`52`	`52`	`}`
`53`	`53`	`provisioner "file" {`
`54`	`54`	`source = "../install/join_rke2_agent.sh"`
`@@ -62,7 +62,7 @@ resource "aws_instance" "worker" {`
`62`	`62`	`]`
`63`	`63`	`}`
`64`	`64`	`provisioner "local-exec" {`
`65`		`- command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" && sleep 90 \|\| exit 0"`
	`65`	`+ command = "echo \"${var.node_os}\" \| grep -q \"slemicro\" && aws ec2 reboot-instances --instance-ids \"${self.id}\" --region \"${var.region}\" && sleep 90 \|\| exit 0"`
`66`	`66`	`}`
`67`	`67`	`provisioner "remote-exec" {`
`68`	`68`	`inline = [<<-EOT`