diff options
author | Christian Pointner <equinox@spreadspace.org> | 2018-01-25 10:44:50 +0100 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2018-01-25 10:44:50 +0100 |
commit | f9d95ad3434738ce7b372c7dad70dba136c0da17 (patch) | |
tree | 66155f5b23492078e5a7c46924b675b0263e2908 | |
parent | some clenaup and minor improvments (diff) | |
parent | rename k8s-stream group to k8s-emc (diff) |
merged
-rw-r--r-- | group_vars/k8s-emc/vars.yml (renamed from 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 | 26 | ||||
-rw-r--r-- | playbooks/k8s-emc.yaml (renamed from playbooks/k8s-stream.yaml) | 12 | ||||
-rw-r--r-- | roles/docker/tasks/main.yaml | 4 | ||||
-rw-r--r-- | roles/kubernetes-base/tasks/main.yaml | 4 | ||||
-rw-r--r-- | roles/vm-install/templates/libvirt-domain.xml.j2 | 4 |
9 files changed, 30 insertions, 30 deletions
diff --git a/group_vars/k8s-stream/vars.yml b/group_vars/k8s-emc/vars.yml index ef333f72..679c5181 100644 --- a/group_vars/k8s-stream/vars.yml +++ b/group_vars/k8s-emc/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 @@ -59,25 +59,25 @@ emc-test [scaleway:children] emc-xx -[k8s-stream-encoder] +[k8s-emc-encoder] dione helene -# [k8s-stream-streamer] +# [k8s-emc-streamer] # emc-test -[k8s-stream-streamer:children] +[k8s-emc-streamer:children] emc-xx -[k8s-stream-master] +[k8s-emc-master] dione #emc-master -[k8s-stream-stats] -kube2016 +[k8s-emc-stats] +emc-stats -[k8s-stream:children] -k8s-stream-master -k8s-stream-encoder -k8s-stream-streamer -k8s-stream-stats +[k8s-emc:children] +k8s-emc-master +k8s-emc-encoder +k8s-emc-streamer +k8s-emc-stats diff --git a/playbooks/k8s-stream.yaml b/playbooks/k8s-emc.yaml index 87da9828..bc981be3 100644 --- a/playbooks/k8s-stream.yaml +++ b/playbooks/k8s-emc.yaml @@ -1,13 +1,13 @@ --- - name: prepare variables and do some sanity checks - hosts: k8s-stream + hosts: k8s-emc gather_facts: no run_once: yes tasks: - name: setup variables set_fact: - kubernetes_nodes: "{{ groups['k8s-stream'] }}" - kubernetes_nodes_master: "{{ groups['k8s-stream-master'] | first }}" + kubernetes_nodes: "{{ groups['k8s-emc'] }}" + kubernetes_nodes_master: "{{ groups['k8s-emc-master'] | first }}" - name: check whether every node has a net_index assigned fail: @@ -26,7 +26,7 @@ ######## - name: install kubernetes and overlay network - hosts: k8s-stream + hosts: k8s-emc roles: ## Since `base` has a dependency for docker it would install and start the daemon ## without the docker daemon config file generated by `net`. @@ -38,12 +38,12 @@ - role: kubernetes-base - name: configure kubernetes master - hosts: k8s-stream-master + hosts: k8s-emc-master roles: - role: kubernetes-master - name: configure kubernetes nodes - hosts: k8s-stream:!k8s-stream-master + hosts: k8s-emc:!k8s-emc-master roles: - role: kubernetes-node 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 8fd3b6d7..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 }}'/> + <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 }}'/> + <source dev='/dev/mapper/{{ lv.vg | replace('-', '--') }}-{{ lv.lv | replace('-', '--') }}'/> <target dev='{{ device }}' bus='scsi'/> </disk> {% endfor %} |