From b5e4a8178fce6ab9d60f1c4e2cd9ec53cbd5d2f8 Mon Sep 17 00:00:00 2001
From: Ritu Sood <ritu.sood@intel.com>
Date: Wed, 14 Aug 2019 19:41:37 +0000
Subject: Add support for Network Operator

ovn4nfvk8s plugin now uses operator sdk
and controller runtime. It now includes
support for Network operator. This patch
includes changes needed in KUD for that.

Signed-off-by: Ritu Sood <ritu.sood@intel.com>
Issue-ID: MULTICLOUD-684
Change-Id: I63dc971e257067c69c70a8996eaffd1a9d8a4c2c
---
 .../playbooks/configure-ovn4nfv.yml                | 101 +++------------------
 1 file changed, 12 insertions(+), 89 deletions(-)

(limited to 'kud/deployment_infra/playbooks')

diff --git a/kud/deployment_infra/playbooks/configure-ovn4nfv.yml b/kud/deployment_infra/playbooks/configure-ovn4nfv.yml
index 2084c95d..cff05296 100644
--- a/kud/deployment_infra/playbooks/configure-ovn4nfv.yml
+++ b/kud/deployment_infra/playbooks/configure-ovn4nfv.yml
@@ -10,95 +10,6 @@
 - import_playbook: configure-ovn.yml
 - import_playbook: configure-multus.yml
 
-- hosts: kube-master:kube-node
-  environment:
-    PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin/"
-  pre_tasks:
-    - name: Load kud variables
-      include_vars:
-        file: kud-vars.yml
-  roles:
-    - role: andrewrothstein.go
-      go_ver: "{{ go_version }}"
-  tasks:
-    - name: clone ovn4nfv-k8s-plugin repo
-      git:
-        repo: "{{ ovn4nfv_url }}"
-        dest: "{{ ovn4nfv_dest }}"
-        version: "{{ ovn4nfv_version }}"
-        force: yes
-      when: ovn4nfv_source_type == "source"
-    - name: clean ovn4nfvk8s left over files
-      make:
-        chdir: "{{ ovn4nfv_dest }}"
-        target: clean
-    - name: build ovn4nfvk8s-cni
-      make:
-        chdir: "{{ ovn4nfv_dest }}"
-        target: ovn4nfvk8s-cni
-      become: yes
-      environment:
-        GOPATH: "{{ go_path }}"
-    - name: copy ovn4nfvk8s-cni to cni folder
-      command: "mv {{ ovn4nfv_dest }}/ovn4nfvk8s-cni /opt/cni/bin/ovn4nfvk8s-cni"
-      become: yes
-    - name: create ovn4k8s config file
-      become: yes
-      blockinfile:
-        path: /etc/openvswitch/ovn4nfv_k8s.conf
-        create: yes
-        block: |
-          [logging]
-          loglevel=5
-          logfile=/var/log/openvswitch/ovn4k8s.log
-
-          [cni]
-          conf-dir=/etc/cni/net.d
-          plugin=ovn4nfvk8s-cni
-
-          [kubernetes]
-          kubeconfig=/etc/kubernetes/admin.conf
-    - name: create ovnkube logging directory
-      file:
-        path: /var/log/openvswitch
-        state: directory
-
-- hosts: kube-master
-  environment:
-    PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin/"
-  become: yes
-  tasks:
-    - name: Load kud variables
-      include_vars:
-        file: kud-vars.yml
-    - name: build ovn4nfvk8s
-      make:
-        chdir: "{{ ovn4nfv_dest }}"
-        target: ovn4nfvk8s
-      environment:
-        GOPATH: "{{ go_path }}"
-    - name: copy ovn4nfvk8s to /usr/bin folder
-      command: "mv {{ ovn4nfv_dest }}/ovn4nfvk8s /usr/bin/ovn4nfvk8s"
-    - name: create ovn4nfvk8s systemd service
-      blockinfile:
-        path: /etc/systemd/system/ovn4nfvk8s.service
-        create: yes
-        block: |
-          [Unit]
-          Description=OVN4NFV Kubernetes Daemon
-
-          [Service]
-          ExecStart=/usr/bin/ovn4nfvk8s \
-                -k8s-kubeconfig=/etc/kubernetes/admin.conf
-
-          [Install]
-          WantedBy=multi-user.target
-    - name: start ovn4nfvk8s systemd service
-      service:
-        name: ovn4nfvk8s
-        state: started
-        enabled: yes
-
 - hosts: localhost
   pre_tasks:
     - name: Load kud variables
@@ -124,3 +35,15 @@
     - name: create network objects
       shell: "/usr/local/bin/kubectl apply -f /tmp/ovn4nfvnetwork.yml"
       ignore_errors: True
+
+    - name: create operator namespace
+      shell: "/usr/local/bin/kubectl create namespace operator"
+      ignore_errors: True
+
+    - name: apply nfn operator label
+      command: "/usr/local/bin/kubectl label node {{ item }} nfnType=operator --overwrite"
+      with_inventory_hostnames: ovn-central
+
+    - name: Apply NFN operator, operator roles, CRD's and ovn4nfv Daemonset
+      shell: "/usr/local/bin/kubectl apply -f ../images/nfn.yml"
+      ignore_errors: True
-- 
cgit 1.2.3-korg