From 9aa53e59f5cbc7d2a62adecd536d8641e04a11f4 Mon Sep 17 00:00:00 2001 From: Murat Aybars <39916128+aybarsm@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:54:09 +0000 Subject: [PATCH] Pre package_manager reconstruction --- roles/network/vars/main.yml | 6 +++++- roles/proxmox/defaults/main.yml | 21 +++++++++++++++++++++ roles/proxmox/tasks/main.yml | 12 ++++++------ 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/roles/network/vars/main.yml b/roles/network/vars/main.yml index 6d27da7..f63d58f 100644 --- a/roles/network/vars/main.yml +++ b/roles/network/vars/main.yml @@ -14,4 +14,8 @@ network__hosts_all: "{{ network__all | selectattr('entry__type', 'eq', 'host') | # Sort hosts by hostname to avoid unneccessary changes network__hosts_all_ipv4: "{{ network__hosts_all | selectattr('ip', 'ansible.utils.ipv4') | sort(attribute='hostname') }}" network__hosts_all_ipv6: "{{ network__hosts_all | selectattr('ip', 'ansible.utils.ipv6') | sort(attribute='hostname') }}" -##### END: network hosts vars \ No newline at end of file +##### END: network hosts vars + +##### BEGIN: network iptables vars +network__iptables_all: "{{ network__all | selectattr('entry__type', 'eq', 'iptables') }}" +##### END: network iptables vars \ No newline at end of file diff --git a/roles/proxmox/defaults/main.yml b/roles/proxmox/defaults/main.yml index 3e24e2a..039fedc 100644 --- a/roles/proxmox/defaults/main.yml +++ b/roles/proxmox/defaults/main.yml @@ -1,5 +1,26 @@ proxmox__role_enabled: false +proxmox__repo_url_enterprise: https://enterprise.proxmox.com/debian +proxmox__repo_url_no_subscription: http://download.proxmox.com/debian +proxmox__repo_keys: + bookworm: + url: https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg + keyring: /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg + bullseye: + url: https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg + keyring: /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg + +proxmox__purpose_names: ['pve', 'pbs', 'pmg', 'ceph_pacific', 'ceph_quincy', 'ceph_reef', 'zfs'] +proxmox__purpose_types: ['enterprise', 'no-subscription'] +proxmox__purpose_packages: + pve: ['pve-manager'] + pbs: ['proxmox-backup-server'] + pmg: ['proxmox-mailgateway'] + ceph_pacific: ['ceph', 'ceph-common', 'ceph-mds', 'ceph-fuse'] + ceph_quincy: ['ceph', 'ceph-common', 'ceph-mds', 'ceph-fuse'] + ceph_reef: ['ceph', 'ceph-common', 'ceph-mds', 'ceph-fuse'] + zfs: ['zfsutils-linux', 'zfs-initramfs', 'zfs-zed'] + proxmox__clusters: {} proxmox__use_only: ['host', 'group', 'default'] diff --git a/roles/proxmox/tasks/main.yml b/roles/proxmox/tasks/main.yml index d9292e3..f664c59 100644 --- a/roles/proxmox/tasks/main.yml +++ b/roles/proxmox/tasks/main.yml @@ -103,12 +103,12 @@ # - proxmox__role_enabled | default(false) | bool # - (proxmox__ssl_certificate | default(undef(), true)) is defined or (proxmox__ssl_key | default(undef(), true)) is defined -- name: Include Proxmox datacenter tasks - ansible.builtin.include_tasks: - file: datacenter/datacenter.yml - when: - - proxmox__role_enabled - - __proxmox__cluster.init | default('', true) == inventory_hostname +# - name: Include Proxmox datacenter tasks +# ansible.builtin.include_tasks: +# file: datacenter.yml +# when: +# - proxmox__role_enabled +# - __proxmox__cluster.init | default('', true) == inventory_hostname # - name: Include Proxmox QEMU tasks # ansible.builtin.include_tasks: