Merge remote-tracking branch 'origin/master' into ubuntu_24_04

cradle8810 · Apr 30, 2024 · ce88fb3 · ce88fb3
2 parents c28e923 + 4abc516
commit ce88fb3
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 107 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/inventories/host_vars/console.yml b/inventories/host_vars/console.yml
@@ -24,6 +24,7 @@ apt:
   - p7zip-full
   - python3-pip
   - samba-common
+  - sshpass
   - vim
   - vlc
   - wireshark

diff --git a/inventories/host_vars/hosts_hayaworld.yml b/inventories/host_vars/hosts_hayaworld.yml
diff --git a/inventories/host_vars/macbook.yml b/inventories/host_vars/macbook.yml
@@ -10,6 +10,7 @@ brew_taps:
   - libaacs
   - libde265
   - libheif
+  - mas
   - nkf
   - p7zip
   - pdftoipe

diff --git a/inventories/host_vars/networks.yml b/inventories/host_vars/networks.yml
@@ -5,6 +5,11 @@ network:
     interface: ens160
     ipv4: 192.168.1.100
     shortname: rui
+  win10:
+    hostname: step.hayaworld.local
+    interface: ens160
+    ipv4: 192.168.1.101
+    shortname: win10
   console:
     hostname: console.hayaworld.local
     interface: ens160
@@ -15,16 +20,11 @@ network:
     interface: ens160
     ipv4: 192.168.1.104
     shortname: runner
-  docker:
-    hostname: docker.hayaworld.local
+  zabbix:
+    hostname: zabbix.hayaworld.local
     interface: ens160
     ipv4: 192.168.1.106
-    shortname: docker
-  ubuntu2404:
-    hostname: ubuntu2404.hayaworld.local
-    interface: ens160
-    ipv4: 192.168.1.107
-    shortname: ubuntu2404
+    shortname: zabbix
   haru:
     hostname: haru.hayaworld.local
     interface: ens160
@@ -35,26 +35,33 @@ network:
     interface: ens160
     ipv4: 192.168.1.109
     shortname: bsd
-  jenkins:
-    hostname: jenkins.hayaworld.local
+  step:
+    hostname: step.hayaworld.local
     interface: ens160
     ipv4: 192.168.1.111
-    shortname: jenkins
+    shortname: step
   tm:
     hostname: tm.hayaworld.local
     interface: ens160
     ipv4: 192.168.1.112
     shortname: tm
+  jenkins:
+    hostname: jenkins.hayaworld.local
+    interface: ens160
+    ipv4: 192.168.1.131
+    shortname: jenkins
   skylark:
     hostname: skylark.hayaworld.local
     interface: ens160
     ipv4: 192.168.1.200
     shortname: skylark
+
+
+network_dhcp:
   macbook:
     hostname: HayabookAir2023.hayaworld.local
     shortname: HayabookAir2023
 
-
 subnet:
   mask: 24
   gw4: 192.168.1.1

diff --git a/ip_range.txt b/ip_range.txt
diff --git a/macbook.yml b/macbook.yml
@@ -12,7 +12,7 @@
   tasks:
     - name: Set Hostname
       ansible.builtin.hostname:
-        name: "{{ network.macbook.hostname }}"
+        name: "{{ network_dhcp.macbook.hostname }}"
       become: true
       tags:
         - network

diff --git a/netplan.sample.yml b/netplan.sample.yml
diff --git a/rui.yml b/rui.yml
@@ -11,7 +11,6 @@
     - inventories/host_vars/rui/ads_hosts/NXDOMAIN.yml
     - inventories/host_vars/rui/ads_hosts/NXDOMAIN_book_scam.yml
     - inventories/host_vars/rui.yml
-    - inventories/host_vars/hosts_hayaworld.yml
     - inventories/host_vars/networks.yml
 
   handlers:

diff --git a/templates/rui/etc/hosts.j2 b/templates/rui/etc/hosts.j2
@@ -1,6 +1,6 @@
 127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
 
-{% for item in hosts_hayaworld %}
-{{ item.IP }} {{ item.A }}
+{% for host in network.values() %}
+{{ host.ipv4 }} {{ host.hostname }}
 {% endfor %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ brew_taps: @@
       - libaacs
       - libde265
       - libheif
+      - mas
       - nkf
       - p7zip
       - pdftoipe
@@ Expand Down @@