summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2018-06-22 18:02:59 -0700
committerClark Boylan <clark.boylan@gmail.com>2018-07-03 20:07:42 -0700
commit7bfe80df739d34f4b2639814a37b342b01775049 (patch)
tree9e327f5de93b87094f1801eff716aaec66aa8595
parent7fa875d100179d044a7f997b9a30ca5cad158b38 (diff)
Cleanup the kata setup role
This adds a modprobe for vhost_net to ensure it is present for kata. Also we will remove the explicit docker install as .ci/setup.sh should do it for us now. Allow k8s cluster-cidr range to talk to port 6443 (k8s api server). Change-Id: Ic1c13e9635e00bcdd096c48c8a7983ccc19bfbda
Notes
Notes (review): Code-Review+2: Joshua Hesketh <josh@nitrotech.org> Code-Review+2: Andreas Jaeger <jaegerandi@gmail.com> Workflow+1: Andreas Jaeger <jaegerandi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 04 Jul 2018 17:52:38 +0000 Reviewed-on: https://review.openstack.org/577590 Project: openstack-infra/openstack-zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/kata-setup/tasks/main.yaml12
-rw-r--r--roles/kata-setup/tasks/setup/Fedora.yaml9
2 files changed, 21 insertions, 0 deletions
diff --git a/roles/kata-setup/tasks/main.yaml b/roles/kata-setup/tasks/main.yaml
index b4ff984..834c341 100644
--- a/roles/kata-setup/tasks/main.yaml
+++ b/roles/kata-setup/tasks/main.yaml
@@ -6,6 +6,18 @@
6 - "setup/{{ ansible_os_family }}.yaml" 6 - "setup/{{ ansible_os_family }}.yaml"
7 - "setup/default.yaml" 7 - "setup/default.yaml"
8 8
9- name: Allow k8s cluster range to talk to k8s api
10 iptables:
11 state: present
12 action: insert
13 chain: INPUT
14 ip_version: ipv4
15 protocol: tcp
16 source: "10.244.0.0/16"
17 destination_port: 6443
18 jump: ACCEPT
19 become: yes
20
9- name: Run kata setup.sh 21- name: Run kata setup.sh
10 args: 22 args:
11 executable: /bin/bash 23 executable: /bin/bash
diff --git a/roles/kata-setup/tasks/setup/Fedora.yaml b/roles/kata-setup/tasks/setup/Fedora.yaml
index 6d96703..3759b1f 100644
--- a/roles/kata-setup/tasks/setup/Fedora.yaml
+++ b/roles/kata-setup/tasks/setup/Fedora.yaml
@@ -45,3 +45,12 @@
45 name: docker-ce 45 name: docker-ce
46 state: present 46 state: present
47 become: yes 47 become: yes
48
49 # TODO why isn't this necessary on Ubuntu?
50- name: Ensure vhost and vhost_net modules are present as kata checks for these
51 args:
52 executable: /bin/bash
53 shell: |
54 set -x
55 modprobe vhost_net
56 become: yes