From f018f1f2ead670a83e50105838731c0fc6247efe Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 23 Jan 2018 00:52:33 +0100 Subject: rename kube2016 to emc-stats --- group_vars/k8s-stream/vars.yml | 2 +- host_playbooks/emc-stats.yaml | 9 +++++ host_playbooks/kube2016.yaml | 9 ----- host_vars/emc-stats.yaml | 42 ++++++++++++++++++++++++ host_vars/kube2016.yaml | 42 ------------------------ host_vars/sk2016.yaml | 2 +- hosts.ini | 6 ++-- roles/vm-install/templates/libvirt-domain.xml.j2 | 4 +-- 8 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 host_playbooks/emc-stats.yaml delete mode 100644 host_playbooks/kube2016.yaml create mode 100644 host_vars/emc-stats.yaml delete mode 100644 host_vars/kube2016.yaml 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/emc-stats.yaml b/host_playbooks/emc-stats.yaml new file mode 100644 index 00000000..112f978a --- /dev/null +++ b/host_playbooks/emc-stats.yaml @@ -0,0 +1,9 @@ +--- +- name: Basic Setup + hosts: emc-stats + roles: + - role: base + - role: sshserver + - role: vm-grub +# - role: vm-network + - role: zsh diff --git a/host_playbooks/kube2016.yaml b/host_playbooks/kube2016.yaml deleted file mode 100644 index edd5fc8d..00000000 --- a/host_playbooks/kube2016.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Basic Setup - hosts: kube2016 - roles: - - role: base - - role: sshserver - - role: vm-grub -# - role: vm-network - - role: zsh diff --git a/host_vars/emc-stats.yaml b/host_vars/emc-stats.yaml new file mode 100644 index 00000000..933650c0 --- /dev/null +++ b/host_vars/emc-stats.yaml @@ -0,0 +1,42 @@ +--- +vm_install_host: sk2016 + +vm_install: + host: "{{ vm_install_host }}" + mem: 8192 + numcpu: 6 + disks: + primary: vda + virtio: + vda: + vg: storage + lv: "{{ inventory_hostname }}" + size: 100g + interfaces: + - idx: 1 + bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" + name: primary0 + autostart: True + +vm_network: + systemd_link: + interfaces: "{{ vm_install.interfaces }}" + primary: + interface: primary0 + ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" + mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}" + gateway: "{{ hostvars[vm_install_host].vm_host.network.ip }}" + nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" + domain: spreadspace.org + +docker_lvm: + vg: "{{ inventory_hostname }}" + lv: docker + size: 15G + fs: ext4 + +kubelet_lvm: + vg: "{{ inventory_hostname }}" + lv: kubelet + size: 10G + fs: ext4 diff --git a/host_vars/kube2016.yaml b/host_vars/kube2016.yaml deleted file mode 100644 index fa2d8d1d..00000000 --- a/host_vars/kube2016.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -vm_install_host: sk2016 - -vm_install: - host: "{{ vm_install_host }}" - mem: 8192 - numcpu: 6 - disks: - primary: vda - virtio: - vda: - vg: storage - lv: "{{ inventory_hostname }}" - size: 100g - interfaces: - - idx: 1 - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" - name: primary0 - autostart: True - -vm_network: - systemd_link: - interfaces: "{{ vm_install.interfaces }}" - primary: - interface: primary0 - ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" - mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}" - gateway: "{{ hostvars[vm_install_host].vm_host.network.ip }}" - nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" - domain: spreadspace.org - -docker_lvm: - vg: kube2016 - lv: docker - size: 15G - fs: ext4 - -kubelet_lvm: - vg: kube2016 - 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 diff --git a/hosts.ini b/hosts.ini index d414aba8..0a683b0c 100644 --- a/hosts.ini +++ b/hosts.ini @@ -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() %} - + {% endfor %} @@ -44,7 +44,7 @@ {% for device, lv in vm_install.disks.scsi.items() %} - + {% endfor %} -- cgit v1.2.3 From 25d599c49271741810d04a6151d38b9b9b9743b2 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 23 Jan 2018 01:06:48 +0100 Subject: rename k8s-stream group to k8s-emc --- group_vars/k8s-emc/vars.yml | 27 ++++++++++++++++ group_vars/k8s-stream/vars.yml | 27 ---------------- hosts.ini | 20 ++++++------ playbooks/k8s-emc.yaml | 39 ++++++++++++++++++++++++ playbooks/k8s-stream.yaml | 39 ------------------------ roles/docker/tasks/main.yaml | 4 +-- roles/kubernetes-base/tasks/main.yaml | 4 +-- roles/vm-install/templates/libvirt-domain.xml.j2 | 4 +-- 8 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 group_vars/k8s-emc/vars.yml delete mode 100644 group_vars/k8s-stream/vars.yml create mode 100644 playbooks/k8s-emc.yaml delete mode 100644 playbooks/k8s-stream.yaml diff --git a/group_vars/k8s-emc/vars.yml b/group_vars/k8s-emc/vars.yml new file mode 100644 index 00000000..679c5181 --- /dev/null +++ b/group_vars/k8s-emc/vars.yml @@ -0,0 +1,27 @@ +docker_pkg_version: 17.03.2~ce-0~debian-stretch + +kubernetes: + pkg_version: 1.9.2-00 + + dedicated_master: False + api_extra_sans: + - dione.spreadspace.org + + pod_ip_range: 172.18.0.0/16 + pod_ip_range_size: 24 + service_ip_range: 172.18.192.0/18 + ## net_index must be in the range between 1 and 191 -> 190 hosts possible + ## + ## hardcoded hostnames are not nice but if we do this via host_vars + ## the info is spread over multiple files and this makes it more diffcult + ## to find mistakes, so it is nicer to keep it in one place... + net_index: + emc-01: 1 + emc-02: 2 + emc-03: 3 + emc-04: 4 + emc-test: 99 + emc-master: 100 + dione: 101 + helene: 102 + emc-stats: 120 diff --git a/group_vars/k8s-stream/vars.yml b/group_vars/k8s-stream/vars.yml deleted file mode 100644 index 679c5181..00000000 --- a/group_vars/k8s-stream/vars.yml +++ /dev/null @@ -1,27 +0,0 @@ -docker_pkg_version: 17.03.2~ce-0~debian-stretch - -kubernetes: - pkg_version: 1.9.2-00 - - dedicated_master: False - api_extra_sans: - - dione.spreadspace.org - - pod_ip_range: 172.18.0.0/16 - pod_ip_range_size: 24 - service_ip_range: 172.18.192.0/18 - ## net_index must be in the range between 1 and 191 -> 190 hosts possible - ## - ## hardcoded hostnames are not nice but if we do this via host_vars - ## the info is spread over multiple files and this makes it more diffcult - ## to find mistakes, so it is nicer to keep it in one place... - net_index: - emc-01: 1 - emc-02: 2 - emc-03: 3 - emc-04: 4 - emc-test: 99 - emc-master: 100 - dione: 101 - helene: 102 - emc-stats: 120 diff --git a/hosts.ini b/hosts.ini index 0a683b0c..36624085 100644 --- a/hosts.ini +++ b/hosts.ini @@ -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] +[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-emc.yaml b/playbooks/k8s-emc.yaml new file mode 100644 index 00000000..17aa3510 --- /dev/null +++ b/playbooks/k8s-emc.yaml @@ -0,0 +1,39 @@ +--- +- name: prepare cluster config + hosts: k8s-emc + gather_facts: no + run_once: yes + tasks: + - name: configure node lists + set_fact: + kubernetes_nodes: "{{ groups['k8s-emc'] }}" + kubernetes_nodes_master: "{{ groups['k8s-emc-master'] | first }}" + + - name: check if every node has a net_index assigned + debug: + msg: "nodes without net-index: {{ kubernetes_nodes | difference(kubernetes.net_index.keys()) | join(', ') }}" + failed_when: kubernetes_nodes | difference(kubernetes.net_index.keys()) | length > 0 + +- name: install kubernetes and overlay network + 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`. + ## This means that the docker daemon will create a bridge and install iptables rules + ## upon first startup (the first time this playbook runs on a specific host). + ## Since it is a tedious task to remove the interface and the firewall rules it is much + ## easier to just run `net` before `base` as `net` does not need anything from `base`. + - role: kubernetes-net + - role: kubernetes-base + +- name: configure kubernetes master + hosts: k8s-emc-master + roles: + - role: kubernetes-master + +- name: configure kubernetes nodes + hosts: k8s-emc:!k8s-emc-master + roles: + - role: kubernetes-node + +## TODO: cleanup (remove superflous nodes and delete bootstrap token) diff --git a/playbooks/k8s-stream.yaml b/playbooks/k8s-stream.yaml deleted file mode 100644 index ec2d2748..00000000 --- a/playbooks/k8s-stream.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- name: prepare cluster config - hosts: k8s-stream - gather_facts: no - run_once: yes - tasks: - - name: configure node lists - set_fact: - kubernetes_nodes: "{{ groups['k8s-stream'] }}" - kubernetes_nodes_master: "{{ groups['k8s-stream-master'] | first }}" - - - name: check if every node has a net_index assigned - debug: - msg: "nodes without net-index: {{ kubernetes_nodes | difference(kubernetes.net_index.keys()) | join(', ') }}" - failed_when: kubernetes_nodes | difference(kubernetes.net_index.keys()) | length > 0 - -- name: install kubernetes and overlay network - hosts: k8s-stream - roles: - ## Since `base` has a dependency for docker it would install and start the daemon - ## without the docker daemon config file generated by `net`. - ## This means that the docker daemon will create a bridge and install iptables rules - ## upon first startup (the first time this playbook runs on a specific host). - ## Since it is a tedious task to remove the interface and the firewall rules it is much - ## easier to just run `net` before `base` as `net` does not need anything from `base`. - - role: kubernetes-net - - role: kubernetes-base - -- name: configure kubernetes master - hosts: k8s-stream-master - roles: - - role: kubernetes-master - -- name: configure kubernetes nodes - hosts: k8s-stream:!k8s-stream-master - roles: - - role: kubernetes-node - -## TODO: cleanup (remove superflous nodes and delete bootstrap token) 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() %} - + {% endfor %} @@ -44,7 +44,7 @@ {% for device, lv in vm_install.disks.scsi.items() %} - + {% endfor %} -- cgit v1.2.3