talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not auto-mount custom datasets.

Browse Source
This commit is contained in:
Tom Alexander 2022-11-01 20:30:07 -04:00
parent 0d68fac269
commit d7a8dd4d67
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/bhyve/tasks/freebsd.yaml
View File

@ -20,6 +20,7 @@
extra_zfs_properties: extra_zfs_properties:
mountpoint: "{{ bhyve_mountpoint }}" mountpoint: "{{ bhyve_mountpoint }}"
canmount: "noauto" canmount: "noauto"
"ta:bemount": "on"
- name: Enable bhyve - name: Enable bhyve
community.general.sysrc: community.general.sysrc:

4
ansible/roles/jail/tasks/freebsd.yaml
View File

@ -10,7 +10,7 @@
zfs: zfs:
name: "{{ item.dataset|default(jail_zfs_dataset) }}/jails/{{ item.name }}" name: "{{ item.dataset|default(jail_zfs_dataset) }}/jails/{{ item.name }}"
state: present state: present
extra_zfs_properties: '{{ {''mountpoint'': item.dataset_mountpoint|default(jail_zfs_dataset_mountpoint) + "/jails/" + item.name}|combine(item.properties|default({})) }}' extra_zfs_properties: '{{ {''mountpoint'': item.dataset_mountpoint|default(jail_zfs_dataset_mountpoint) + "/jails/" + item.name}|combine(item.properties|default({}))|combine({''canmount'': ''noauto'', ''ta:bemount'': ''on''}) }}'
loop: "{{ jail_list }}" loop: "{{ jail_list }}"
@ -27,7 +27,7 @@
zfs: zfs:
name: "{{ item.0.dataset|default(jail_zfs_dataset) }}/persistent/{{ item.0.name }}/{{ item.1.name }}" name: "{{ item.0.dataset|default(jail_zfs_dataset) }}/persistent/{{ item.0.name }}/{{ item.1.name }}"
state: present state: present
extra_zfs_properties: '{{ {''mountpoint'': item.0.dataset_mountpoint|default(jail_zfs_dataset_mountpoint) + "/jails/" + item.0.name + item.1.mount }|combine(item.1.properties|default({})) }}' extra_zfs_properties: '{{ {''mountpoint'': item.0.dataset_mountpoint|default(jail_zfs_dataset_mountpoint) + "/jails/" + item.0.name + item.1.mount }|combine(item.1.properties|default({}))|combine({''canmount'': ''noauto'', ''ta:bemount'': ''on''}) }}'
loop: "{{ jail_list|subelements('persist', skip_missing=True) }}" loop: "{{ jail_list|subelements('persist', skip_missing=True) }}"
- name: Install scripts - name: Install scripts