diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-07-28 21:55:37 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-07-28 21:55:37 +0200 |
| commit | ef1d375723319e74ac0c7dde5a26606a55657c51 (patch) | |
| tree | 3b06ec7f84d356d6820667c9614d012709f98280 | |
| parent | install emc-dist0 and emc-00 (diff) | |
install emc-master
| -rw-r--r-- | inventory/group_vars/vmhost-sk-2019vm/vars.yml | 8 | ||||
| -rw-r--r-- | inventory/host_vars/emc-master.yml | 6 | ||||
| -rw-r--r-- | roles/vm/guest/define/templates/libvirt-domain.xml.j2 | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/inventory/group_vars/vmhost-sk-2019vm/vars.yml b/inventory/group_vars/vmhost-sk-2019vm/vars.yml index 362c3c35..221fa581 100644 --- a/inventory/group_vars/vmhost-sk-2019vm/vars.yml +++ b/inventory/group_vars/vmhost-sk-2019vm/vars.yml @@ -11,8 +11,8 @@ vm_host: prefix: 192.168.250.0/24 offsets: sk-torrent: 136 -# emc-master: 137 - lw-master: 137 + emc-master: 137 +# lw-master: 137 ele-gwhetzner: 138 sgg-icecast: 141 ch-mimas: 142 @@ -24,8 +24,8 @@ vm_host: prefix: 178.63.180.136/29 offsets: sk-torrent: 0 -# emc-master: 1 - lw-master: 1 + emc-master: 1 +# lw-master: 1 ele-gwhetzner: 2 sgg-icecast: 5 ch-mimas: 6 diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml index 1b4021c8..81fabd12 100644 --- a/inventory/host_vars/emc-master.yml +++ b/inventory/host_vars/emc-master.yml @@ -11,9 +11,9 @@ install: type: zfs name: root size: 20g - # sdb: - # type: image - # path: /dev/zvol/storage/streamstats + sdb: + type: image + path: /dev/zvol/storage/streamstats interfaces: - bridge: br-public name: primary0 diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 index 28f237a9..41671f73 100644 --- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 @@ -58,6 +58,8 @@ <source dev='/dev/mapper/{{ src.vg | replace('-', '--') }}-{{ src.lv | replace('-', '--') }}'/> {% elif src.type == 'zfs' %} <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ inventory_hostname }}/{{ src.name }}'/> +{% elif src.type == 'image' %} + <source dev='{{ src.path }}'/> {% endif %} <target dev='{{ device }}' bus='virtio'/> </disk> @@ -73,6 +75,8 @@ <source dev='/dev/mapper/{{ src.vg | replace('-', '--') }}-{{ src.lv | replace('-', '--') }}'/> {% elif src.type == 'zfs' %} <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ inventory_hostname }}/{{ src.name }}'/> +{% elif src.type == 'image' %} + <source dev='{{ src.path }}'/> {% endif %} <target dev='{{ device }}' bus='scsi'/> </disk> |