consul: Use GetInterfaceIP for advertise_addr

#332
femiwiki · Oct 5, 2024 · 8a12cb2 · 8a12cb2
1 parent 3b77c1a
commit 8a12cb2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 48 deletions.
diff --git a/aws/ec2.tf b/aws/ec2.tf
@@ -153,8 +153,8 @@ resource "aws_instance" "test_femiwiki" {
   }
 
   tags = {
-    Name                   = "Test Server"
-    consul-cloud-auto-join = "true"
+    Name           = "Test Server"
+    ConsulAutoJoin = "auto-join"
   }
 
   lifecycle {

diff --git a/aws/res/consul.hcl b/aws/res/consul.hcl
@@ -7,7 +7,7 @@ acl {
 
 server           = true
 node_name        = "femiwiki"
-advertise_addr   = "IP_ADDRESS"
+advertise_addr   = "{{GetInterfaceIP \"ens5\"}}"
 bind_addr        = "0.0.0.0"
 client_addr      = "0.0.0.0"
 bootstrap        = true

diff --git a/aws/res/consul.service b/aws/res/consul.service
diff --git a/aws/res/nomad.service b/aws/res/nomad.service
diff --git a/aws/res/user-data.sh.tftpl b/aws/res/user-data.sh.tftpl
@@ -156,8 +156,6 @@ dnf install -y "consul-$${CONSUL_VERSION}"
 cat <<EOF >/etc/consul.d/consul.hcl
 ${consul_config}
 EOF
-IP_ADDRESS=$(curl http://instance-data/latest/meta-data/local-ipv4)
-sed -i "s/IP_ADDRESS/$IP_ADDRESS/g" /etc/consul.d/consul.hcl
 
 dnf install -y consul-cni-$${CONSUL_CNI_VERSION}