Skip to content

Commit

Permalink
1.0.14
Browse files Browse the repository at this point in the history
  • Loading branch information
thost96 authored Oct 26, 2023
1 parent e60ff03 commit b2fa5ee
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Ansible Role for Proxmox PVE Server configuration and Tools
* Enable no-subscription Repository
* InfluxDB and Graphite Metric Server configuration
* LLDP Install
* System Apt Upgrades
* System APT Upgrades

### Planned Features / in Developement
* Kernel Upgrades incl. old Kernel cleanup
Expand Down
16 changes: 13 additions & 3 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
hosts: all
become: true
pre_tasks:
# Subscription Popup
- name: Create JS File
file:
dest: /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
state: present
# All APT Tasks
- name: Update apt cache.
apt:
Expand All @@ -18,16 +23,21 @@
- role: thost96.proxmox
ignore_errors: true
vars:
# Additional pre-task neccessary
disable_subscription_popup: false
disable_subscription_popup: true
disable_enterprise_repo: true
enable_no_subscription_repo: true
# Additional pre-task neccessary for influx and graphite / or file validation only
metrics_influx: true
metrics_influx_server: "influx"
metrics_influx_port: 8089
metrics_graphite: true
metrics_graphite_server: "graphite"
metrics_graphite_port: 2003
system_upgrades: true
# Not yet implemented
system_kernel_upgrade: false
# Not yet implemented
system_kernel_clean: false
# Not yet implemented
tools_cockpit: false
tools_lldp: true
tools_lldp: true
8 changes: 4 additions & 4 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ lint: |
ansible-lint
platforms:
# Proxmox 8.x
- name: instance1
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest"
- name: debian12
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian12}-ansible:latest"
command: ${MOLECULE_DOCKER_COMMAND:-""}
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
privileged: true
pre_build_image: true
# Proxmox 7.x
- name: instance2
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian10}-ansible:latest"
- name: debian11
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest"
command: ${MOLECULE_DOCKER_COMMAND:-""}
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
Expand Down
8 changes: 2 additions & 6 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@
- name: Enable PVE no Subcription Repository
block:
- ansible.builtin.get_url:
url: https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg
dest: /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
# - ansible.builtin.apt_key:
# url: https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg
# keyring: /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
# state: present
url: https://enterprise.proxmox.com/debian/proxmox-release-{{ ansible_distribution_release }}.gpg
dest: /etc/apt/trusted.gpg.d/proxmox-release-{{ ansible_distribution_release }}.gpg
- apt_repository:
repo: "deb http://download.proxmox.com/debian/pve {{ ansible_distribution_release }} pve-no-subscription"
filename: pve-no-subscription
Expand Down

0 comments on commit b2fa5ee

Please sign in to comment.