diff options
| -rw-r--r-- | host_playbooks/dione.yaml (renamed from playbooks/dione.yaml) | 1 | ||||
| -rw-r--r-- | host_playbooks/elesearch.yaml (renamed from playbooks/elesearch.yaml) | 0 | ||||
| -rw-r--r-- | host_playbooks/emc-test.yaml (renamed from playbooks/emc-test.yaml) | 1 | ||||
| -rw-r--r-- | host_playbooks/helene.yaml (renamed from playbooks/helene.yaml) | 1 | ||||
| -rw-r--r-- | host_playbooks/kube2016.yaml (renamed from playbooks/kube2016.yaml) | 1 | ||||
| -rw-r--r-- | host_playbooks/sk2013.yaml (renamed from playbooks/sk2013.yaml) | 0 | ||||
| -rw-r--r-- | host_playbooks/sk2016.yaml (renamed from playbooks/sk2016.yaml) | 0 | ||||
| -rw-r--r-- | host_playbooks/thetys.yaml (renamed from playbooks/thetys.yaml) | 1 | ||||
| -rw-r--r-- | hosts.ini | 5 | ||||
| -rw-r--r-- | playbooks/k8s-stream.yaml | 6 | ||||
| -rw-r--r-- | roles/kubernetes-net/files/daemon.json | 4 | ||||
| -rw-r--r-- | roles/kubernetes-net/tasks/main.yaml | 5 |
12 files changed, 18 insertions, 7 deletions
diff --git a/playbooks/dione.yaml b/host_playbooks/dione.yaml index 160e195a..c73b36ee 100644 --- a/playbooks/dione.yaml +++ b/host_playbooks/dione.yaml @@ -6,4 +6,3 @@ - role: sshserver - role: zsh - role: admin-user - - role: kubernetes-base diff --git a/playbooks/elesearch.yaml b/host_playbooks/elesearch.yaml index 7640977e..7640977e 100644 --- a/playbooks/elesearch.yaml +++ b/host_playbooks/elesearch.yaml diff --git a/playbooks/emc-test.yaml b/host_playbooks/emc-test.yaml index ce78e3d4..812e4758 100644 --- a/playbooks/emc-test.yaml +++ b/host_playbooks/emc-test.yaml @@ -7,4 +7,3 @@ - role: sshserver - role: zsh - role: admin-user - - role: kubernetes-base diff --git a/playbooks/helene.yaml b/host_playbooks/helene.yaml index 706a6bd7..b0ae4860 100644 --- a/playbooks/helene.yaml +++ b/host_playbooks/helene.yaml @@ -6,4 +6,3 @@ - role: sshserver - role: zsh - role: admin-user - - role: kubernetes-base diff --git a/playbooks/kube2016.yaml b/host_playbooks/kube2016.yaml index 54205725..edd5fc8d 100644 --- a/playbooks/kube2016.yaml +++ b/host_playbooks/kube2016.yaml @@ -7,4 +7,3 @@ - role: vm-grub # - role: vm-network - role: zsh - - role: kubernetes-base diff --git a/playbooks/sk2013.yaml b/host_playbooks/sk2013.yaml index 387f1af1..387f1af1 100644 --- a/playbooks/sk2013.yaml +++ b/host_playbooks/sk2013.yaml diff --git a/playbooks/sk2016.yaml b/host_playbooks/sk2016.yaml index 33de823d..33de823d 100644 --- a/playbooks/sk2016.yaml +++ b/host_playbooks/sk2016.yaml diff --git a/playbooks/thetys.yaml b/host_playbooks/thetys.yaml index 11dfab64..ef0f202a 100644 --- a/playbooks/thetys.yaml +++ b/host_playbooks/thetys.yaml @@ -5,4 +5,3 @@ - role: base - role: sshserver - role: zsh - - role: kubernetes-base @@ -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/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/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 |