1.1.1

thost96 · Oct 26, 2023 · c631c25 · c631c25
1 parent 9b05e33
commit c631c25
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 39 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,18 +6,25 @@ name: Release
     tags:
       - '*'
 
-env:
-  GALAXY_USERNAME: thost96
-
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
-        uses: actions/[email protected]
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'thost96.proxmox'
 
-      - name: Release Ansible Role to Galaxy
-        uses: hspaans/ansible-galaxy-action@v1
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
         with:
-          api_key: ${{ secrets.GALAXY_API_KEY }}
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-core
+
+      - name: Trigger a new import on Galaxy.
+        run: >-
+          ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }}
+          $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/README.md b/README.md
@@ -20,6 +20,8 @@ Ansible Role for Proxmox PVE Server configuration and Tools
 * Postfix Mail Alert Configuration
 * ZFS Latency Monitoring
 * PVE Network Configuration
+* LXC Template Download
+* PVE DNS and Domain configuration
 
 All Fetures are tested and working with Proxmox version 7.x and 8.x.
 
@@ -93,6 +95,12 @@ If set to `true`, old and unused Debian/PVE Kernel will be removed.
 
 ### Tools
 
+#### LLDP
+
+    tools_lldp: false
+
+If enabled, LLDP will be installed and activated at boot.
+
 #### Cockpit as ZFS UI
 
     tools_cockpit: false
@@ -107,6 +115,14 @@ If enabled, Cockpit with ZFS Manager Plugin will be installed to manage ZFS from
       roles:
         - role: thost96.proxmox
 
+### Install LLDP Tool
+
+    - hosts: all
+      vars:
+        tools_lldp: true
+      roles:
+        - role: thost96.proxmox
+
 ### Enable InfluxDB Metrics
 
     - hosts: all

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,20 +1,20 @@
 ---
+# Working Features
 disable_subscription_popup: true
 disable_enterprise_repo: true
 enable_no_subscription_repo: true
+system_upgrades: false
+tools_lldp: false
+
+# Planned Features / in Developement
 metrics_influx: false
 metrics_influx_server: "influx"
 metrics_influx_port: 8089
 metrics_graphite: false
 metrics_graphite_server: "graphite"
 metrics_graphite_port: 2003
-
-system_upgrades: false
 system_kernel_upgrade: false
 system_kernel_clean: false
-
 tools_cockpit: false
-tools_lldp: false
-
 # https://blog.roberthallam.org/2022/09/monitoring-zfs-latencies-in-proxmox-part-1/
 metics_influx_zpool: false
diff --git a/meta/main.yml b/meta/main.yml
@@ -10,6 +10,7 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - all
+        - bullseye
+        - bookworm
   categories:
     - system
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -12,6 +12,8 @@
       file:
         path: /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
         state: touch
+        access_time: preserve
+        modification_time: preserve
     # All APT Tasks
     - name: Update apt cache.
       apt:
@@ -30,18 +32,18 @@
         disable_subscription_popup: true
         disable_enterprise_repo: true
         enable_no_subscription_repo: true
+        system_upgrades: true
+        tools_lldp: true
         # Additional pre-task neccessary for influx and graphite / or file validation only
-        metrics_influx: true
+        metrics_influx: false
         metrics_influx_server: "influx"
         metrics_influx_port: 8089
-        metrics_graphite: true
+        metrics_graphite: false
         metrics_graphite_server: "graphite"
-        metrics_graphite_port: 2003        
-        system_upgrades: true
+        metrics_graphite_port: 2003
         # Not yet implemented
         system_kernel_upgrade: false
         # Not yet implemented
         system_kernel_clean: false
         # Not yet implemented
         tools_cockpit: false
-        tools_lldp: true        
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -27,26 +27,6 @@
         state: present
   when: "enable_no_subscription_repo | bool"
 
-- name: Configure InfluxDB Metric Server
-  copy:
-    dest: "/etc/pve/status.cfg"
-    content: |
-      influxdb: 
-        server {{ metrics_influx_server }}
-        port {{ metrics_influx_port }}
-    backup: yes
-  when: "metrics_influx | bool"
-
-- name: Configure Graphite Metric Server
-  copy:
-    dest: "/etc/pve/status.cfg"
-    content: |
-      graphite: 
-        server {{ metrics_graphite_server }}
-        port {{ metrics_graphite_port }}
-    backup: yes
-  when: "metrics_graphite | bool"
-
 - name: Perform PVE Upgrades
   apt:
     update_cache: yes
@@ -72,6 +52,26 @@
         name: lldpd.service
   when: "tools_lldp | bool"
 
+- name: Configure InfluxDB Metric Server
+  copy:
+    dest: "/etc/pve/status.cfg"
+    content: |
+      influxdb: 
+        server {{ metrics_influx_server }}
+        port {{ metrics_influx_port }}
+    backup: yes
+  when: "metrics_influx | bool"
+
+- name: Configure Graphite Metric Server
+  copy:
+    dest: "/etc/pve/status.cfg"
+    content: |
+      graphite: 
+        server {{ metrics_graphite_server }}
+        port {{ metrics_graphite_port }}
+    backup: yes
+  when: "metrics_graphite | bool"
+
 - name: Cockpit ZFS Tools Setup
   block:
     - name: Install required system packages