diff options
| -rw-r--r-- | group_vars/k8s-stream/vars.yml | 2 | ||||
| -rw-r--r-- | host_playbooks/emc-stats.yaml (renamed from host_playbooks/kube2016.yaml) | 2 | ||||
| -rw-r--r-- | host_vars/emc-stats.yaml (renamed from host_vars/kube2016.yaml) | 4 | ||||
| -rw-r--r-- | host_vars/sk2016.yaml | 2 | ||||
| -rw-r--r-- | hosts.ini | 6 | ||||
| -rw-r--r-- | roles/vm-install/templates/libvirt-domain.xml.j2 | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/group_vars/k8s-stream/vars.yml b/group_vars/k8s-stream/vars.yml index ef333f72..679c5181 100644 --- a/group_vars/k8s-stream/vars.yml +++ b/group_vars/k8s-stream/vars.yml @@ -24,4 +24,4 @@ kubernetes: emc-master: 100 dione: 101 helene: 102 - kube2016: 120 + emc-stats: 120 diff --git a/host_playbooks/kube2016.yaml b/host_playbooks/emc-stats.yaml index edd5fc8d..112f978a 100644 --- a/host_playbooks/kube2016.yaml +++ b/host_playbooks/emc-stats.yaml @@ -1,6 +1,6 @@ --- - name: Basic Setup - hosts: kube2016 + hosts: emc-stats roles: - role: base - role: sshserver diff --git a/host_vars/kube2016.yaml b/host_vars/emc-stats.yaml index fa2d8d1d..933650c0 100644 --- a/host_vars/kube2016.yaml +++ b/host_vars/emc-stats.yaml @@ -30,13 +30,13 @@ vm_network: domain: spreadspace.org docker_lvm: - vg: kube2016 + vg: "{{ inventory_hostname }}" lv: docker size: 15G fs: ext4 kubelet_lvm: - vg: kube2016 + vg: "{{ inventory_hostname }}" lv: kubelet size: 10G fs: ext4 diff --git a/host_vars/sk2016.yaml b/host_vars/sk2016.yaml index 449f6860..872223db 100644 --- a/host_vars/sk2016.yaml +++ b/host_vars/sk2016.yaml @@ -29,4 +29,4 @@ vm_host: - 213.133.98.98 - 213.133.99.99 indices: - kube2016: 200 + emc-stats: 200 @@ -31,7 +31,7 @@ elewolke elestream elemedia elesearch -kube2016 +emc-stats [elevate:children] emc-xx @@ -46,7 +46,7 @@ sk2016 [hetzner] sk2013 sk2016 -kube2016 +emc-stats mimas sktorrent elewolke @@ -74,7 +74,7 @@ dione #emc-master [k8s-stream-stats] -kube2016 +emc-stats [k8s-stream:children] k8s-stream-master diff --git a/roles/vm-install/templates/libvirt-domain.xml.j2 b/roles/vm-install/templates/libvirt-domain.xml.j2 index 8fd3b6d7..5546fd44 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 }}'/> + <source dev='/dev/mapper/{{ lv.vg }}-{{ 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 }}'/> + <source dev='/dev/mapper/{{ lv.vg }}-{{ lv.lv | replace('-', '--') }}'/> <target dev='{{ device }}' bus='scsi'/> </disk> {% endfor %} |