diff options
| -rw-r--r-- | inventory/host_vars/emc-master.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/lw-master.yml | 2 | ||||
| -rw-r--r-- | roles/vm/guest/define/templates/libvirt-domain.xml.j2 | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml index 0a7ede28..77cc5d32 100644 --- a/inventory/host_vars/emc-master.yml +++ b/inventory/host_vars/emc-master.yml @@ -12,7 +12,7 @@ install: name: root size: 20g sdb: - type: image + type: blockdev path: /dev/zvol/storage/streamstats interfaces: - bridge: br-public diff --git a/inventory/host_vars/lw-master.yml b/inventory/host_vars/lw-master.yml index 1b4021c8..cee52198 100644 --- a/inventory/host_vars/lw-master.yml +++ b/inventory/host_vars/lw-master.yml @@ -12,7 +12,7 @@ install: name: root size: 20g # sdb: - # type: image + # type: blockdev # path: /dev/zvol/storage/streamstats interfaces: - bridge: br-public diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 index 37d84d8e..e526d38d 100644 --- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 @@ -58,7 +58,7 @@ <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' %} +{% elif src.type == 'blockdev' %} <source dev='{{ src.path }}'/> {% endif %} <target dev='{{ device }}' bus='virtio'/> @@ -75,7 +75,7 @@ <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' %} +{% elif src.type == 'blockdev' %} <source dev='{{ src.path }}'/> {% endif %} <target dev='{{ device }}' bus='scsi'/> |