From e97c53dcfa23926e140dcc5793a0c67a4d653371 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 29 Sep 2019 22:31:37 +0200 Subject: sk-2019vm can run machines now --- inventory/host_vars/sk-2019vm.yml | 18 ++++++++++++++---- inventory/host_vars/sk-testvm.yml | 14 +++++++++++++- 2 files changed, 27 insertions(+), 5 deletions(-) (limited to 'inventory/host_vars') diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml index 04f34626..c0578ab9 100644 --- a/inventory/host_vars/sk-2019vm.yml +++ b/inventory/host_vars/sk-2019vm.yml @@ -12,9 +12,8 @@ network: {} vm_host: network: interface: br-public - ip: 192.168.250.254 - mask: 255.255.255.0 - nameservers: + prefix: 192.168.250.254/24 + dns: - 213.133.100.100 - 213.133.98.98 - 213.133.99.99 @@ -23,6 +22,17 @@ vm_host: nat: yes +ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan }}" + +cryptdisk_volumes: + crypto-nvme0: + passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme0'].passphrase }}" + device: /dev/disk/by-id/nvme-eui.0025388291b201dc-part3 + crypto-nvme1: + passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme1'].passphrase }}" + device: /dev/disk/by-id/nvme-eui.0025388291b201cb-part3 + + zfs_zpool_name: storage zfs_zpool_mountpoint: /srv/storage -zfs_zpool_create_vdevs: mirror nvme0n1p3 nvme1n1p3 +zfs_zpool_create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1 diff --git a/inventory/host_vars/sk-testvm.yml b/inventory/host_vars/sk-testvm.yml index 656bef32..88fa4de1 100644 --- a/inventory/host_vars/sk-testvm.yml +++ b/inventory/host_vars/sk-testvm.yml @@ -13,6 +13,18 @@ install: pool: storage name: "{{ inventory_hostname }}" size: 5g + interfaces: + - bridge: br-public + name: primary0 autostart: False -network: {} +network: + nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}" + domain: "{{ host_domain }}" + systemd_link: + interfaces: "{{ install.interfaces }}" + primary: + interface: primary0 + ip: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}" + mask: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('netmask') }}" + gateway: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('address') }}" -- cgit v1.2.3