Merge pull request #88 from cradle8810/87_rui_add_dnsmasq_conf_not_works

rui.hayaworld.local用playbookの変数指定誤りを修正
cradle8810 · Apr 23, 2024 · b274bab · b274bab
2 parents 33d8701 + 63da3ea
commit b274bab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/inventories/host_vars/rui/rui.yml → inventories/host_vars/rui.yml b/inventories/host_vars/rui/rui.yml → inventories/host_vars/rui.yml
@@ -1,15 +1,4 @@
 ---
-network:
-  rui:
-    hostname: rui.hayaworld.local
-    interface: ens160
-    ipv4: 192.168.1.100
-    subnet: 24
-    gw4: 192.168.1.1
-    dns4:
-      - 202.232.2.3
-      - 202.232.2.2
-
 apt:
   - avahi-daemon
   - binutils
@@ -41,7 +30,7 @@ dnsmasq:
   dhcp_option:
     ntp_server: 210.130.188.10
     dns_server: "{{ network.rui.ipv4 }}"
-    router: "{{ network.rui.gw4 }}"
+    router: "{{ network.gw4 }}"
     netmask: "255.255.255.0"
   dns:
     cache_size: 4000

diff --git a/rui.yml b/rui.yml
@@ -10,7 +10,7 @@
     - inventories/host_vars/rui/dhcphosts.yml
     - inventories/host_vars/rui/ads_hosts/NXDOMAIN.yml
     - inventories/host_vars/rui/ads_hosts/NXDOMAIN_book_scam.yml
-    - inventories/host_vars/rui/rui.yml
+    - inventories/host_vars/rui.yml
     - inventories/host_vars/hosts_hayaworld.yml
     - inventories/host_vars/networks.yml
 

diff --git a/templates/rui/etc/dnsmasq.d/resolv.txt.j2 b/templates/rui/etc/dnsmasq.d/resolv.txt.j2
@@ -1,3 +1,3 @@
-{% for resolver in network.rui.dns4 %}
+{% for resolver in network.dns4 %}
 server={{ resolver }}
 {% endfor %}