From 3e0468c6fe28e80f570210bdcfe81d02b554e4fe Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 20 Dec 2017 21:55:49 +0100 Subject: mov host specific playbooks to seperate dir, added kubernetes-net role --- host_playbooks/dione.yaml | 8 ++++++++ host_playbooks/elesearch.yaml | 9 +++++++++ host_playbooks/emc-test.yaml | 9 +++++++++ host_playbooks/helene.yaml | 8 ++++++++ host_playbooks/kube2016.yaml | 9 +++++++++ host_playbooks/sk2013.yaml | 6 ++++++ host_playbooks/sk2016.yaml | 6 ++++++ host_playbooks/thetys.yaml | 7 +++++++ hosts.ini | 5 +++-- playbooks/dione.yaml | 9 --------- playbooks/elesearch.yaml | 9 --------- playbooks/emc-test.yaml | 10 ---------- playbooks/helene.yaml | 9 --------- playbooks/k8s-stream.yaml | 6 ++++++ playbooks/kube2016.yaml | 10 ---------- playbooks/sk2013.yaml | 6 ------ playbooks/sk2016.yaml | 6 ------ playbooks/thetys.yaml | 8 -------- roles/kubernetes-net/files/daemon.json | 4 ++++ roles/kubernetes-net/tasks/main.yaml | 5 +++++ 20 files changed, 80 insertions(+), 69 deletions(-) create mode 100644 host_playbooks/dione.yaml create mode 100644 host_playbooks/elesearch.yaml create mode 100644 host_playbooks/emc-test.yaml create mode 100644 host_playbooks/helene.yaml create mode 100644 host_playbooks/kube2016.yaml create mode 100644 host_playbooks/sk2013.yaml create mode 100644 host_playbooks/sk2016.yaml create mode 100644 host_playbooks/thetys.yaml delete mode 100644 playbooks/dione.yaml delete mode 100644 playbooks/elesearch.yaml delete mode 100644 playbooks/emc-test.yaml delete mode 100644 playbooks/helene.yaml create mode 100644 playbooks/k8s-stream.yaml delete mode 100644 playbooks/kube2016.yaml delete mode 100644 playbooks/sk2013.yaml delete mode 100644 playbooks/sk2016.yaml delete mode 100644 playbooks/thetys.yaml create mode 100644 roles/kubernetes-net/files/daemon.json create mode 100644 roles/kubernetes-net/tasks/main.yaml diff --git a/host_playbooks/dione.yaml b/host_playbooks/dione.yaml new file mode 100644 index 00000000..c73b36ee --- /dev/null +++ b/host_playbooks/dione.yaml @@ -0,0 +1,8 @@ +--- +- name: Basic Setup + hosts: dione + roles: + - role: base + - role: sshserver + - role: zsh + - role: admin-user diff --git a/host_playbooks/elesearch.yaml b/host_playbooks/elesearch.yaml new file mode 100644 index 00000000..7640977e --- /dev/null +++ b/host_playbooks/elesearch.yaml @@ -0,0 +1,9 @@ +--- +- name: Basic Setup + hosts: elesearch + roles: + - role: sshserver + - role: vm-grub + - role: vm-network + - role: base + - role: zsh diff --git a/host_playbooks/emc-test.yaml b/host_playbooks/emc-test.yaml new file mode 100644 index 00000000..812e4758 --- /dev/null +++ b/host_playbooks/emc-test.yaml @@ -0,0 +1,9 @@ +--- +- name: Basic Setup + hosts: emc-test + roles: + - role: scaleway-slim + - role: base + - role: sshserver + - role: zsh + - role: admin-user diff --git a/host_playbooks/helene.yaml b/host_playbooks/helene.yaml new file mode 100644 index 00000000..b0ae4860 --- /dev/null +++ b/host_playbooks/helene.yaml @@ -0,0 +1,8 @@ +--- +- name: Basic Setup + hosts: helene + roles: + - role: base + - role: sshserver + - role: zsh + - role: admin-user diff --git a/host_playbooks/kube2016.yaml b/host_playbooks/kube2016.yaml new file mode 100644 index 00000000..edd5fc8d --- /dev/null +++ b/host_playbooks/kube2016.yaml @@ -0,0 +1,9 @@ +--- +- name: Basic Setup + hosts: kube2016 + roles: + - role: base + - role: sshserver + - role: vm-grub +# - role: vm-network + - role: zsh diff --git a/host_playbooks/sk2013.yaml b/host_playbooks/sk2013.yaml new file mode 100644 index 00000000..387f1af1 --- /dev/null +++ b/host_playbooks/sk2013.yaml @@ -0,0 +1,6 @@ +--- +- name: Basic Setup + hosts: sk2013 + roles: + - role: sshserver + - role: vm-host diff --git a/host_playbooks/sk2016.yaml b/host_playbooks/sk2016.yaml new file mode 100644 index 00000000..33de823d --- /dev/null +++ b/host_playbooks/sk2016.yaml @@ -0,0 +1,6 @@ +--- +- name: Basic Setup + hosts: sk2016 + roles: + - role: sshserver + - role: vm-host diff --git a/host_playbooks/thetys.yaml b/host_playbooks/thetys.yaml new file mode 100644 index 00000000..ef0f202a --- /dev/null +++ b/host_playbooks/thetys.yaml @@ -0,0 +1,7 @@ +--- +- name: Basic Setup + hosts: thetys + roles: + - role: base + - role: sshserver + - role: zsh diff --git a/hosts.ini b/hosts.ini index 00bfce37..15c836f2 100644 --- a/hosts.ini +++ b/hosts.ini @@ -54,11 +54,12 @@ helene [k8s-stream-streamer] emc-test -emc0[1:3] +#emc0[1:3] -[k8s-stream] +[k8s-stream-stats] kube2016 [k8s-stream:children] k8s-stream-encoder k8s-stream-streamer +k8s-stream-stats diff --git a/playbooks/dione.yaml b/playbooks/dione.yaml deleted file mode 100644 index 160e195a..00000000 --- a/playbooks/dione.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Basic Setup - hosts: dione - roles: - - role: base - - role: sshserver - - role: zsh - - role: admin-user - - role: kubernetes-base diff --git a/playbooks/elesearch.yaml b/playbooks/elesearch.yaml deleted file mode 100644 index 7640977e..00000000 --- a/playbooks/elesearch.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Basic Setup - hosts: elesearch - roles: - - role: sshserver - - role: vm-grub - - role: vm-network - - role: base - - role: zsh diff --git a/playbooks/emc-test.yaml b/playbooks/emc-test.yaml deleted file mode 100644 index ce78e3d4..00000000 --- a/playbooks/emc-test.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Basic Setup - hosts: emc-test - roles: - - role: scaleway-slim - - role: base - - role: sshserver - - role: zsh - - role: admin-user - - role: kubernetes-base diff --git a/playbooks/helene.yaml b/playbooks/helene.yaml deleted file mode 100644 index 706a6bd7..00000000 --- a/playbooks/helene.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Basic Setup - hosts: helene - roles: - - role: base - - role: sshserver - - role: zsh - - role: admin-user - - role: kubernetes-base diff --git a/playbooks/k8s-stream.yaml b/playbooks/k8s-stream.yaml new file mode 100644 index 00000000..4d9e3375 --- /dev/null +++ b/playbooks/k8s-stream.yaml @@ -0,0 +1,6 @@ +--- +- name: Install Kubernetes + hosts: k8s-stream + roles: + - role: kubernetes-base + - role: kubernetes-net diff --git a/playbooks/kube2016.yaml b/playbooks/kube2016.yaml deleted file mode 100644 index 54205725..00000000 --- a/playbooks/kube2016.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Basic Setup - hosts: kube2016 - roles: - - role: base - - role: sshserver - - role: vm-grub -# - role: vm-network - - role: zsh - - role: kubernetes-base diff --git a/playbooks/sk2013.yaml b/playbooks/sk2013.yaml deleted file mode 100644 index 387f1af1..00000000 --- a/playbooks/sk2013.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Basic Setup - hosts: sk2013 - roles: - - role: sshserver - - role: vm-host diff --git a/playbooks/sk2016.yaml b/playbooks/sk2016.yaml deleted file mode 100644 index 33de823d..00000000 --- a/playbooks/sk2016.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Basic Setup - hosts: sk2016 - roles: - - role: sshserver - - role: vm-host diff --git a/playbooks/thetys.yaml b/playbooks/thetys.yaml deleted file mode 100644 index 11dfab64..00000000 --- a/playbooks/thetys.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Basic Setup - hosts: thetys - roles: - - role: base - - role: sshserver - - role: zsh - - role: kubernetes-base diff --git a/roles/kubernetes-net/files/daemon.json b/roles/kubernetes-net/files/daemon.json new file mode 100644 index 00000000..28001640 --- /dev/null +++ b/roles/kubernetes-net/files/daemon.json @@ -0,0 +1,4 @@ +{ + "bridge": "none", + "iptables": false +} diff --git a/roles/kubernetes-net/tasks/main.yaml b/roles/kubernetes-net/tasks/main.yaml new file mode 100644 index 00000000..907115c4 --- /dev/null +++ b/roles/kubernetes-net/tasks/main.yaml @@ -0,0 +1,5 @@ +--- +- name: disable docker iptales and bridge + copy: + src: daemon.json + dest: /etc/docker/daemon.json -- cgit v1.2.3