diff --git a/inventory.yaml b/inventory.yaml index 1395d3a..62c5e5e 100644 --- a/inventory.yaml +++ b/inventory.yaml @@ -38,14 +38,6 @@ all: # https://wiki.k-space.ee/hosting/proxmox proxmox: hosts: - pve1.proxmox.infra.k-space.ee: - ansible_host: 172.21.20.1 - pve2.proxmox.infra.k-space.ee: - ansible_host: 172.21.20.2 - pve8.proxmox.infra.k-space.ee: - ansible_host: 172.21.20.8 - pve9.proxmox.infra.k-space.ee: - ansible_host: 172.21.20.9 pve90.proxmox.infra.k-space.ee: ansible_host: 172.21.20.90 pve91.proxmox.infra.k-space.ee: diff --git a/proxmox/admin_scripts/bashrc b/proxmox/admin_scripts/bashrc index b7932c5..2cfde5f 100644 --- a/proxmox/admin_scripts/bashrc +++ b/proxmox/admin_scripts/bashrc @@ -8,7 +8,7 @@ esac source /root/telegram.env -alias updl="rup && apt update -q && apt full-upgrade --download-only -y -qq && apt autoremove -y -qq" +alias updl="`# rup &&` apt update -q && apt full-upgrade --download-only -y -qq && apt autoremove -y -qq" #TODO: reinstate restic alias rup="restic -q -r local:/root/jc/restic/"$HOSTNAME" -p /root/jc/restic/passwd backup /etc ~/.bash_history && restic -q -r local:/root/jc/restic/"$HOSTNAME" -p /root/jc/restic/passwd forget --prune --keep-last 14 --keep-within 3m --keep-weekly 520" #TODO: restic -p ~/jc/restic/passwd -r local:"??no more nas??/restic/$HOSTNAME" init @@ -80,7 +80,7 @@ function _on { } # shellcheck disable=SC2120 -function off { +function on { if [[ "$#" -gt 0 ]]; then _on "$@" return "$?" diff --git a/proxmox/admin_scripts/template.sh b/proxmox/admin_scripts/template.sh index 3ce9399..1a2a439 100755 --- a/proxmox/admin_scripts/template.sh +++ b/proxmox/admin_scripts/template.sh @@ -11,8 +11,8 @@ if [[ "$#" -ne 2 ]]; then fi storage="$1" vmid="$2" -img=debian-12 -ident=d12.v2 +img=debian-13 +ident=d13.v2 size=100G # will error if vmid exists @@ -33,7 +33,7 @@ qm create "$vmid" \ # Whole script supposed to be replaced by self-service suite anyway. #TODO: virt-builder version is crap, replacing it with drop-in: -wget 'https://cdimage.debian.org/images/cloud/bookworm/latest/debian-12-genericcloud-amd64.raw' -O "$img".img +wget 'https://cdimage.debian.org/images/cloud/bookworm/latest/debian-13-genericcloud-amd64.raw' -O "$img".img function cleanup { rm "$img".img diff --git a/proxmox/networking.yaml b/proxmox/networking.yaml index 5e17edb..97373bc 100644 --- a/proxmox/networking.yaml +++ b/proxmox/networking.yaml @@ -19,13 +19,9 @@ ansible.builtin.systemd_service: name: networking.service state: reloaded ---- + - name: PVE CEPH network configuration - hosts: - - pve90.proxmox.infra.k-space.ee - - pve91.proxmox.infra.k-space.ee - - pve92.proxmox.infra.k-space.ee - - pve93.proxmox.infra.k-space.ee + hosts: proxmox serial: 1 # one host at a time tasks: