Merge pull request #395 from cradle8810/proxmox_installed

Proxmox installed
cradle8810 · Dec 23, 2024 · ae1160f · ae1160f
2 parents 0dd4ba7 + e1335f0
commit ae1160f
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 18 deletions.
diff --git a/ansible.cfg b/ansible.cfg
@@ -1,3 +1,4 @@
 [defaults]
 inventory = inventories/hosts
 forks = 6
+timeout = 60
diff --git a/console.yml b/console.yml
@@ -95,6 +95,8 @@
     - name: Mount skylark
       ansible.builtin.import_tasks:
         file: tasks/console/mount_skylark.yml
+      tags:
+        - skylark
 
     - name: Install/Config Zramswap
       ansible.builtin.import_tasks:

diff --git a/inventories/group_vars/all.yml b/inventories/group_vars/all.yml
@@ -23,7 +23,7 @@ all:
     ytdlp:
       linux:
         url: "https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux"
-        checksum: "sha256:2b1b032be1957dd04561103ee59b1c836fd50a3c7f462ec226658b6be5c75a2c"
+        checksum: "sha256:e7788b8556c73e409d5713a4fdb71df12734b0853353f2da2352540dc9d22c95"
       macos:
         url: "https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_macos"
         checksum: ""

diff --git a/inventories/host_vars/console.yml b/inventories/host_vars/console.yml
@@ -18,13 +18,12 @@ apt:
   - libbluray-bdj
   - libbluray2
   - libheif1
-  - open-vm-tools
-  - open-vm-tools-desktop
   - openssh-server
   - openssl
   - p7zip-full
   - packer
   - python3-pip
+  - qemu-guest-agent
   - samba-common
   - sshpass
   - thunderbird
@@ -42,12 +41,13 @@ remove:
 
 services_start:
   - docker
-  - open-vm-tools
+  - gpm
+  - qemu-guest-agent
   - ssh
   - xrdp
 
 homedir:
-  UUID: "27d8944d-a99e-4505-9540-8c99460a1b99"
+  UUID: "03038d24-672a-4707-ba6f-f5beb16d830e"
 
 firewall:
   policy: deny

diff --git a/inventories/host_vars/dockerservice.yml b/inventories/host_vars/dockerservice.yml
@@ -20,7 +20,7 @@ services_start:
   - ssh
 
 dockerdir:
-  UUID: "6db90b73-6dbd-4c00-9b13-724f0cb4e636"
+  UUID: "83eb3244-7590-4634-9ed4-34d268b242e6"
 
 docker_network:
   base: "172.18.0.0/12"

diff --git a/inventories/host_vars/jenkins.yml b/inventories/host_vars/jenkins.yml
@@ -7,11 +7,12 @@ apt:
   - jq
   - openjdk-21-jdk
   - python3-pip
+  - qemu-guest-agent
   - unzip
 
 services_start:
   - jenkins
-  - open-vm-tools
+  - qemu-guest-agent
   - ssh
 
 jenkins:
@@ -33,7 +34,7 @@ jenkins:
   hostname: jenkins.hayaworld.home
   http_port: 8080
   java_options: "-Djenkins.install.runSetupWizard=false"
-  pkg_url: "http://jenkins-deb.hayaworld.home/"
+  pkg_url: "http://jenkins-deb.hayaworld.home"
   plugins:
     - build-timeout
     - discord-notifier
@@ -48,7 +49,7 @@ jenkins:
     - timestamper
     - workflow-aggregator
     - ws-cleanup
-  UUID: "cd5488ca-dc52-42f7-9a4d-79a30499b74e"
+  UUID: "6436a219-ad11-4a16-b8ef-d048a976e137"
   version: "2.480"
 
 firewall:

diff --git a/inventories/host_vars/rui.yml b/inventories/host_vars/rui.yml
@@ -4,7 +4,7 @@ apt:
   - dnsmasq
   - dstat
   - htop
-  - open-vm-tools
+  - qemu-guest-agent
   - rsyslog
 
 rui_info: "{{ network | selectattr('shortname', 'eq', 'rui') }}"
@@ -38,7 +38,7 @@ dnsmasq:
 
 services_start:
   - dnsmasq
-  - open-vm-tools
+  - qemu-guest-agent
   - rsyslog
   - ssh
   - systemd-journald

diff --git a/inventories/host_vars/skylark.yml b/inventories/host_vars/skylark.yml
@@ -1,27 +1,28 @@
 ---
 drives:
   skylark:
-    uuid: 1085e1e0-8f93-44f2-b546-2e7448864338
+    uuid: 9d7a85bd-7a80-4b03-be2b-e14aa713c27d
     mountpoint: /skylark
     filesystem: "btrfs"
     options: "defaults,noatime"
   backup:
     uuid: 77af48a6-5a47-4e06-a106-c5c74b6d1449
     mountpoint: /backup
-    filesystem: "xfs"
-    options: "defaults,users"
+    filesystem: "btrfs"
+    options: "defaults,users,noatime"
 
 services_start:
   - nmbd
-  - open-vm-tools
+  - qemu-guest-agent
   - smbd
   - ssh
 
 apt:
   - dstat
   - ffmpeg
+  - git
   - htop
-  - open-vm-tools
+  - qemu-guest-agent
   - renameutils
   - rsync
   - wget

diff --git a/inventories/host_vars/tm.yml b/inventories/host_vars/tm.yml
@@ -7,7 +7,7 @@ apt:
 
 drives:
   tm:
-    uuid: 60688a7e-9c41-46f5-9b33-1e6d5996faff
+    uuid: 8f22fd40-c438-4981-aced-a84aa0c3db6a
     mountpoint: /tm
     filesystem: "xfs"
     options: "defaults,noatime"

diff --git a/jenkins.yml b/jenkins.yml
@@ -22,6 +22,8 @@
     - name: Install Jenkins
       ansible.builtin.import_tasks:
         file: tasks/jenkins/jenkins_install.yml
+      tags:
+        - jenkins
 
     - name: Install Docker(ce)
       ansible.builtin.import_role:

diff --git a/runner03.yml b/runner03.yml
@@ -9,6 +9,11 @@
     - inventories/host_vars/runner.yml
     - inventories/host_vars/networks.yml
 
+  handlers:
+    - name: Restart handler tasks
+      ansible.builtin.import_tasks:
+        file: handlers/main.yml
+
   tasks:
     - name: Common Settings
       ansible.builtin.import_tasks:
@@ -57,7 +62,11 @@
     - name: Install Pre-builded SNS downloaders
       ansible.builtin.import_tasks:
         file: tasks/sns_dl.yml
+      tags:
+        - sns
 
     - name: Install Ansible from PPA
       ansible.builtin.import_tasks:
         file: tasks/ansible_install.yml
+      tags:
+        - ansible
diff --git a/tasks/all/netplan.yml b/tasks/all/netplan.yml
@@ -12,7 +12,7 @@
       network:
         version: 2
         ethernets:
-          ens160:
+          ens18:
             addresses:
               - "{{ ipv4_addr }}/{{ subnet.mask }}"
             nameservers:

diff --git a/tasks/console/desktop.yml b/tasks/console/desktop.yml
@@ -21,6 +21,7 @@
     - gnome-shell-extension-manager
     - gnome-sushi
     - gnome-tweaks
+    - gpm
     - language-pack-ja
     - nautilus-extension-gnome-terminal
     - python3-psutil