Clean up repository: remove backup files and reorganize infrastructure components

deployment/ansible/templates/nomad-client.hcl

@@ -2,20 +2,20 @@ datacenter = "dc1"
 data_dir = "/opt/nomad/data"
 plugin_dir = "/opt/nomad/plugins"
 log_level = "INFO"
-name = "{{ client_name }}"
+name = "{{ inventory_hostname }}"
 
-bind_addr = "{{ client_ip }}"
+bind_addr = "{{ inventory_hostname }}.tailnet-68f9.ts.net"
 
 addresses {
-  http = "{{ client_ip }}"
-  rpc  = "{{ client_ip }}"
-  serf = "{{ client_ip }}"
+  http = "{{ inventory_hostname }}.tailnet-68f9.ts.net"
+  rpc  = "{{ inventory_hostname }}.tailnet-68f9.ts.net"
+  serf = "{{ inventory_hostname }}.tailnet-68f9.ts.net"
 }
 
 advertise {
-  http = "{{ client_ip }}:4646"
-  rpc  = "{{ client_ip }}:4647"
-  serf = "{{ client_ip }}:4648"
+  http = "{{ inventory_hostname }}.tailnet-68f9.ts.net:4646"
+  rpc  = "{{ inventory_hostname }}.tailnet-68f9.ts.net:4647"
+  serf = "{{ inventory_hostname }}.tailnet-68f9.ts.net:4648"
 }
 
 ports {
@@ -30,15 +30,17 @@ server {
 
 client {
   enabled = true
-  # 配置七仙女服务器地址，使用短名
+  network_interface = "tailscale0"
+  
+  # 配置七仙女服务器地址，使用完整FQDN
   servers = [
-    "semaphore:4647",  # bj-semaphore
-    "ash1d:4647",      # ash1d  
-    "ash2e:4647",      # ash2e
-    "ch2:4647",        # ch2
-    "ch3:4647",        # ch3
-    "onecloud1:4647",  # bj-onecloud1
-    "de:4647"          # de
+    "semaphore.tailnet-68f9.ts.net:4647",
+    "ash1d.tailnet-68f9.ts.net:4647",
+    "ash2e.tailnet-68f9.ts.net:4647",
+    "ch2.tailnet-68f9.ts.net:4647",
+    "ch3.tailnet-68f9.ts.net:4647",
+    "onecloud1.tailnet-68f9.ts.net:4647",
+    "de.tailnet-68f9.ts.net:4647"
   ]
   
   # 配置host volumes
@@ -52,6 +54,18 @@ client {
     "driver.raw_exec.enable" = "1"
     "driver.exec.enable" = "1"
   }
+  
+  # 配置节点元数据
+  meta {
+    consul = "true"
+    consul_version = "1.21.5"
+    consul_server = {% if inventory_hostname in ['master', 'ash3c', 'warden'] %}"true"{% else %}"false"{% endif %}
+  }
+  
+  # 激进的垃圾清理策略
+  gc_interval = "5m"
+  gc_disk_usage_threshold = 80
+  gc_inode_usage_threshold = 70
 }
 
 plugin "nomad-driver-podman" {
@@ -64,13 +78,26 @@ plugin "nomad-driver-podman" {
 }
 
 consul {
-  address = "master:8500,ash3c:8500,warden:8500"
+  address = "master.tailnet-68f9.ts.net:8500,ash3c.tailnet-68f9.ts.net:8500,warden.tailnet-68f9.ts.net:8500"
+  server_service_name = "nomad"
+  client_service_name = "nomad-client"
+  auto_advertise = true
+  server_auto_join = true
+  client_auto_join = true
 }
 
 vault {
   enabled = true
-  address = "http://master:8200,http://ash3c:8200,http://warden:8200"
+  address = "http://master.tailnet-68f9.ts.net:8200,http://ash3c.tailnet-68f9.ts.net:8200,http://warden.tailnet-68f9.ts.net:8200"
   token = "hvs.A5Fu4E1oHyezJapVllKPFsWg"
   create_from_role = "nomad-cluster"
   tls_skip_verify = true
+}
+
+telemetry {
+  collection_interval = "1s"
+  disable_hostname = false
+  prometheus_metrics = true
+  publish_allocation_metrics = true
+  publish_node_metrics = true
 }

deployment/ansible/templates/nomad-server.hcl.j2

@@ -4,12 +4,18 @@ plugin_dir = "/opt/nomad/plugins"
 log_level = "INFO"
 name = "{{ server_name }}"
 
-bind_addr = "{{ server_ip }}"
+bind_addr = "{{ server_name }}.tailnet-68f9.ts.net"
 
 addresses {
-  http = "{{ server_ip }}"
-  rpc  = "{{ server_ip }}"
-  serf = "{{ server_ip }}"
+  http = "{{ server_name }}.tailnet-68f9.ts.net"
+  rpc  = "{{ server_name }}.tailnet-68f9.ts.net"
+  serf = "{{ server_name }}.tailnet-68f9.ts.net"
+}
+
+advertise {
+  http = "{{ server_name }}.tailnet-68f9.ts.net:4646"
+  rpc  = "{{ server_name }}.tailnet-68f9.ts.net:4647"
+  serf = "{{ server_name }}.tailnet-68f9.ts.net:4648"
 }
 
 ports {
@@ -20,8 +26,14 @@ ports {
 
 server {
   enabled = true
-  bootstrap_expect = 3
-  retry_join = ["semaphore", "ash1d", "ash2e", "ch2", "ch3", "onecloud1", "de"]
+  bootstrap_expect = 7
+  retry_join = [
+    {%- for server in groups['nomad_servers'] -%}
+    {%- if server != inventory_hostname -%}
+    "{{ server }}.tailnet-68f9.ts.net"{% if not loop.last %},{% endif %}
+    {%- endif -%}
+    {%- endfor -%}
+  ]
 }
 
 client {
@@ -38,12 +50,17 @@ plugin "nomad-driver-podman" {
 }
 
 consul {
-  address = "master:8500,ash3c:8500,warden:8500"
+  address = "master.tailnet-68f9.ts.net:8500,ash3c.tailnet-68f9.ts.net:8500,warden.tailnet-68f9.ts.net:8500"
+  server_service_name = "nomad"
+  client_service_name = "nomad-client"
+  auto_advertise = true
+  server_auto_join = true
+  client_auto_join = true
 }
 
 vault {
   enabled = true
-  address = "http://master:8200,http://ash3c:8200,http://warden:8200"
+  address = "http://master.tailnet-68f9.ts.net:8200,http://ash3c.tailnet-68f9.ts.net:8200,http://warden.tailnet-68f9.ts.net:8200"
   token = "hvs.A5Fu4E1oHyezJapVllKPFsWg"
   create_from_role = "nomad-cluster"
   tls_skip_verify = true

deployment/ansible/templates/nomad-unified.hcl.j2

@@ -0,0 +1,81 @@
+datacenter = "dc1"
+data_dir = "/opt/nomad/data"
+plugin_dir = "/opt/nomad/plugins"
+log_level = "INFO"
+name = "{{ inventory_hostname }}"
+
+bind_addr = "{{ inventory_hostname }}.tailnet-68f9.ts.net"
+
+addresses {
+  http = "{{ inventory_hostname }}.tailnet-68f9.ts.net"
+  rpc  = "{{ inventory_hostname }}.tailnet-68f9.ts.net"
+  serf = "{{ inventory_hostname }}.tailnet-68f9.ts.net"
+}
+
+advertise {
+  http = "{{ inventory_hostname }}.tailnet-68f9.ts.net:4646"
+  rpc  = "{{ inventory_hostname }}.tailnet-68f9.ts.net:4647"
+  serf = "{{ inventory_hostname }}.tailnet-68f9.ts.net:4648"
+}
+
+ports {
+  http = 4646
+  rpc  = 4647
+  serf = 4648
+}
+
+server {
+  enabled = {{ 'true' if inventory_hostname in groups['nomad_servers'] else 'false' }}
+  {% if inventory_hostname in groups['nomad_servers'] %}
+  bootstrap_expect = 3
+  retry_join = [
+    "semaphore.tailnet-68f9.ts.net",
+    "ash1d.tailnet-68f9.ts.net", 
+    "ash2e.tailnet-68f9.ts.net",
+    "ch2.tailnet-68f9.ts.net",
+    "ch3.tailnet-68f9.ts.net",
+    "onecloud1.tailnet-68f9.ts.net",
+    "de.tailnet-68f9.ts.net"
+  ]
+  {% endif %}
+}
+
+client {
+  enabled = true
+  
+  meta {
+    consul = "true"
+    consul_version = "1.21.5"
+  }
+  
+  # 激进的垃圾清理策略
+  gc_interval = "5m"
+  gc_disk_usage_threshold = 80
+  gc_inode_usage_threshold = 70
+}
+
+plugin "nomad-driver-podman" {
+  config {
+    socket_path = "unix:///run/podman/podman.sock"
+    volumes {
+      enabled = true
+    }
+  }
+}
+
+consul {
+  address = "master.tailnet-68f9.ts.net:8500,ash3c.tailnet-68f9.ts.net:8500,warden.tailnet-68f9.ts.net:8500"
+  server_service_name = "nomad"
+  client_service_name = "nomad-client"
+  auto_advertise = true
+  server_auto_join = true
+  client_auto_join = true
+}
+
+vault {
+  enabled = true
+  address = "http://master.tailnet-68f9.ts.net:8200,http://ash3c.tailnet-68f9.ts.net:8200,http://warden.tailnet-68f9.ts.net:8200"
+  token = "hvs.A5Fu4E1oHyezJapVllKPFsWg"
+  create_from_role = "nomad-cluster"
+  tls_skip_verify = true
+}