diff --git a/nas.tf b/nas.tf index bce29c0..9f3546f 100644 --- a/nas.tf +++ b/nas.tf @@ -24,13 +24,6 @@ resource "proxmox_vm_qemu" "nas" { memory = 4024 disks { - #ide { - # ide0 { - # cdrom { - # iso = "cephfs:iso/debian-12.9.0-amd64-netinst.iso" - # } - # } - #} scsi { scsi0 { disk { @@ -51,23 +44,6 @@ resource "proxmox_vm_qemu" "nas" { } } virtio { - #virtio2 { - # cdrom { - # iso = "cephfs:iso/debian-12.9.0-amd64-netinst.iso" - # } - #} - #virtio0 { - # #This must match the template's drive or it will not use template's drive as root - # #root disk - # disk{ - # asyncio = "native" - # discard = "true" - # iothread = "true" - # size = "42G" - # storage = "local-lvm" - # format = "raw" - # } - #} virtio0 { #bulk disk disk { @@ -75,7 +51,7 @@ resource "proxmox_vm_qemu" "nas" { backup = "false" iothread = "true" size = "8T" - storage = "local-lvm" + storage = "watari" format = "raw" } } diff --git a/roles/ind/nas/nas-install.yml b/roles/ind/nas/nas-install.yml index f617726..a28e9b8 100644 --- a/roles/ind/nas/nas-install.yml +++ b/roles/ind/nas/nas-install.yml @@ -10,8 +10,8 @@ - name: Upgrade-packages.yml - update packages include: ../../lib/upgrade-packages.yml - - name: Install-docker.yml - setting up docker - include: ../../lib/install-docker.yml + #- name: Install-docker.yml - setting up docker + # include: ../../lib/install-docker.yml - name: Install Restic and setup include: ../../lib/setup-restic.yml @@ -19,95 +19,46 @@ - name: Setup Restic Cron jobs include: ../../lib/setup-restic-cron.yml - - name: Create grail user - user: - name: grail - uid: 2003 - group: docker - state: present - create_home: yes - home: /data - shell: /bin/bash + - name: Add OpenMediaVault repository key + ansible.builtin.get_url: + url: https://packages.openmediavault.org/public/archive.key + dest: /usr/share/keyrings/openmediavault-archive-keyring.gpg + mode: '0644' + force: true - - name: Install nfs Packages - apt: - name: - - nfs-common + - name: Add OMV repository + ansible.builtin.apt_repository: + filename: openmediavault + repo: "{{ omv_repo }}" state: present - update_cache: no + key: + url: "{{ omv_key_url }}" - name: Install Python Packages - apt: + ansible.builtin.apt: name: - python3-full - python3-pip state: present update_cache: yes - - name: Setup Service - copy: - dest: /etc/systemd/system/grail.service - content: | - [Unit] - Description=Docker Compose service - Requires=docker.service - After=docker.service + # Install OMV prerequisites + - name: Install required packages + ansible.builtin.apt: + name: + - apt-transport-https + - ca-certificates + - gnupg + state: present - [Service] - Type=oneshot - RemainAfterExit=yes - WorkingDirectory=/home/grail - ExecStart=/usr/bin/docker compose --env-file ./docker-compose.env -f docker-compose.yml up -d - ExecStop=/usr/bin/docker compose --env-file ./docker-compose.env -f docker-compose.yml down + - name: Install OpenMediaVault + ansible.builtin.apt: + name: openmediavault + state: present - [Install] - WantedBy=multi-user.target - owner: root - group: root - mode: '0644' - - - name: Create /home/grail/ - ansible.builtin.file: - path: /home/grail - owner: grail - group: docker - state: directory - - - name: Write docker-compose.yml - ansible.builtin.copy: - src: docker-compose.yml - dest: /home/grail/docker-compose.yml - owner: grail - group: docker - mode: u=rw,g=r,o=r - - - name: Write docker-compose.env - ansible.builtin.copy: - src: docker-compose.env - dest: /home/grail/docker-compose.env - owner: grail - group: docker - mode: u=rw,g=r,o=r - - - name: Check if docker config directory exists - stat: - path: /home/grail/docker/qbittorrent - register: grail_stat - - - name: Restore docker config Dir - shell: | - restic --password-file /home/restic/.resticpassword -r sftp:misamisa://home/restic/$(hostname) --target / restore latest - args: - chdir: /home/grail/ - creates: /home/grail/qbitorrent - when: not grail_stat.stat.exists or not grail_stat.stat.isdir - - - name: Reload systemd daemon - systemd: - daemon_reload: yes - - - name: Start grail Service - systemd: - name: grail + # Enable and start OMV services + - name: Enable OMV services + ansible.builtin.systemd: + name: openmediavault.service + enabled: yes state: started - enabled: yes \ No newline at end of file