summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/docker/tasks/main.yaml4
-rw-r--r--roles/kubernetes-base/tasks/main.yaml4
-rw-r--r--roles/vm-install/templates/libvirt-domain.xml.j24
3 files changed, 6 insertions, 6 deletions
diff --git a/roles/docker/tasks/main.yaml b/roles/docker/tasks/main.yaml
index 2604dead..2253f1ed 100644
--- a/roles/docker/tasks/main.yaml
+++ b/roles/docker/tasks/main.yaml
@@ -12,11 +12,11 @@
- name: create filesystem
filesystem:
fstype: "{{ docker_lvm.fs }}"
- dev: "/dev/mapper/{{ docker_lvm.vg }}-{{ docker_lvm.lv }}"
+ dev: "/dev/mapper/{{ docker_lvm.vg | replace('-', '--') }}-{{ docker_lvm.lv | replace('-', '--') }}"
- name: mount filesytem
mount:
- src: "/dev/mapper/{{ docker_lvm.vg }}-{{ docker_lvm.lv }}"
+ src: "/dev/mapper/{{ docker_lvm.vg | replace('-', '--') }}-{{ docker_lvm.lv | replace('-', '--') }}"
path: /var/lib/docker
fstype: "{{ docker_lvm.fs }}"
state: mounted
diff --git a/roles/kubernetes-base/tasks/main.yaml b/roles/kubernetes-base/tasks/main.yaml
index 171375dd..3cc9cecf 100644
--- a/roles/kubernetes-base/tasks/main.yaml
+++ b/roles/kubernetes-base/tasks/main.yaml
@@ -12,11 +12,11 @@
- name: create filesystem
filesystem:
fstype: "{{ kubelet_lvm.fs }}"
- dev: "/dev/mapper/{{ kubelet_lvm.vg }}-{{ kubelet_lvm.lv }}"
+ dev: "/dev/mapper/{{ kubelet_lvm.vg | replace('-', '--') }}-{{ kubelet_lvm.lv | replace('-', '--') }}"
- name: mount filesytem
mount:
- src: "/dev/mapper/{{ kubelet_lvm.vg }}-{{ kubelet_lvm.lv }}"
+ src: "/dev/mapper/{{ kubelet_lvm.vg | replace('-', '--') }}-{{ kubelet_lvm.lv | replace('-', '--') }}"
path: /var/lib/kubelet
fstype: "{{ kubelet_lvm.fs }}"
state: mounted
diff --git a/roles/vm-install/templates/libvirt-domain.xml.j2 b/roles/vm-install/templates/libvirt-domain.xml.j2
index 5546fd44..c84b1045 100644
--- a/roles/vm-install/templates/libvirt-domain.xml.j2
+++ b/roles/vm-install/templates/libvirt-domain.xml.j2
@@ -33,7 +33,7 @@
{% for device, lv in vm_install.disks.virtio.items() %}
<disk type='block' device='disk'>
<driver name='qemu' type='raw' cache='none' discard='unmap'/>
- <source dev='/dev/mapper/{{ lv.vg }}-{{ lv.lv | replace('-', '--') }}'/>
+ <source dev='/dev/mapper/{{ lv.vg | replace('-', '--') }}-{{ lv.lv | replace('-', '--') }}'/>
<target dev='{{ device }}' bus='virtio'/>
</disk>
{% endfor %}
@@ -44,7 +44,7 @@
{% for device, lv in vm_install.disks.scsi.items() %}
<disk type='block' device='disk'>
<driver name='qemu' type='raw' cache='none' discard='unmap'/>
- <source dev='/dev/mapper/{{ lv.vg }}-{{ lv.lv | replace('-', '--') }}'/>
+ <source dev='/dev/mapper/{{ lv.vg | replace('-', '--') }}-{{ lv.lv | replace('-', '--') }}'/>
<target dev='{{ device }}' bus='scsi'/>
</disk>
{% endfor %}