From b58adb0127b9fe5882b5902c6b865f534659811d Mon Sep 17 00:00:00 2001
From: Rohan Parulekar <rohan.s.parulekar@nuagenetworks.net>
Date: Thu, 3 Aug 2017 08:52:13 -0700
Subject: Nuage changes for Atomic hosts OSE Integration

---
 roles/nuage_node/handlers/main.yaml         |  4 ---
 roles/nuage_node/tasks/main.yaml            | 48 +++++++++--------------------
 roles/nuage_node/templates/vsp-openshift.j2 | 29 -----------------
 3 files changed, 15 insertions(+), 66 deletions(-)
 delete mode 100644 roles/nuage_node/templates/vsp-openshift.j2

(limited to 'roles/nuage_node')

diff --git a/roles/nuage_node/handlers/main.yaml b/roles/nuage_node/handlers/main.yaml
index 8384856ff..60247c33e 100644
--- a/roles/nuage_node/handlers/main.yaml
+++ b/roles/nuage_node/handlers/main.yaml
@@ -1,8 +1,4 @@
 ---
-- name: restart vrs
-  become: yes
-  systemd: name=openvswitch state=restarted
-
 - name: restart node
   become: yes
   systemd: name={{ openshift.common.service_type }}-node state=restarted
diff --git a/roles/nuage_node/tasks/main.yaml b/roles/nuage_node/tasks/main.yaml
index 66d6ef4ca..3764681ff 100644
--- a/roles/nuage_node/tasks/main.yaml
+++ b/roles/nuage_node/tasks/main.yaml
@@ -1,28 +1,18 @@
 ---
-- name: Install Nuage VRS
-  become: yes
-  yum: name={{ vrs_rpm }} state=present
-
-- name: Set the uplink interface
-  become: yes
-  lineinfile: dest={{ vrs_config }} regexp=^NETWORK_UPLINK_INTF line='NETWORK_UPLINK_INTF={{ uplink_interface }}'
-
-- name: Set the Active Controller
-  become: yes
-  lineinfile: dest={{ vrs_config }} regexp=^ACTIVE_CONTROLLER line='ACTIVE_CONTROLLER={{ vsc_active_ip }}'
-
-- name: Set the K8S/OSE Cluster service CIDR
-  become: yes
-  lineinfile: dest={{ vrs_config }} regexp=^K8S_SERVICE_IPV4_SUBNET line='K8S_SERVICE_IPV4_SUBNET={{ k8s_cluster_service_cidr }}'
+- name: Set the Nuage plugin openshift directory fact for Atomic hosts
+  set_fact:
+    vsp_openshift_dir: /var/usr/share/vsp-openshift
+  when: openshift.common.is_atomic | bool
 
-- name: Set the Standby Controller
-  become: yes
-  lineinfile: dest={{ vrs_config }} regexp=^STANDBY_CONTROLLER line='STANDBY_CONTROLLER={{ vsc_standby_ip }}'
-  when: vsc_standby_ip is defined
+- name: Set the Nuage CNI binary directory fact for Atomic hosts
+  set_fact:
+    cni_bin_dir: /var/opt/cni/bin/
+  when: openshift.common.is_atomic | bool
 
-- name: Install plugin rpm
-  become: yes
-  yum: name={{ plugin_rpm }} state=present
+- name: Set the Nuage plugin certs directory fact for Atomic hosts
+  set_fact:
+    nuage_plugin_crt_dir: /var/usr/share/vsp-openshift
+  when: openshift.common.is_atomic | bool
 
 - name: Assure CNI conf dir exists
   become: yes
@@ -32,13 +22,6 @@
   become: yes
   file: path="{{ cni_bin_dir }}" state=directory
 
-- name: Install CNI loopback plugin
-  become: yes
-  copy:
-    src: "{{ k8s_cni_loopback_plugin }}"
-    dest: "{{ cni_bin_dir }}/{{ k8s_cni_loopback_plugin | basename }}"
-    mode: 0755
-
 - name: Copy the certificates and keys
   become: yes
   copy: src="/tmp/{{ item }}" dest="{{ vsp_openshift_dir }}/{{ item }}"
@@ -50,12 +33,11 @@
 
 - include: certificates.yml
 
-- name: Set the vsp-openshift.yaml
-  become: yes
-  template: src=vsp-openshift.j2 dest={{ vsp_openshift_yaml }} owner=root mode=0644
+- name: Restart node services
+  command: /bin/true
   notify:
-    - restart vrs
     - restart node
+  ignore_errors: true
 
 - include: iptables.yml
 
diff --git a/roles/nuage_node/templates/vsp-openshift.j2 b/roles/nuage_node/templates/vsp-openshift.j2
deleted file mode 100644
index f6bccebc2..000000000
--- a/roles/nuage_node/templates/vsp-openshift.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-clientCert: {{ client_cert }} 
-# The key to the certificate in clientCert above
-clientKey: {{ client_key }}
-# The certificate authority's certificate for the local kubelet.  Usually the
-# same as the CA cert used to create the client Cert/Key pair.
-CACert: {{ ca_cert }} 
-# Name of the enterprise in which pods will reside
-enterpriseName: {{ enterprise }} 
-# Name of the domain in which pods will reside
-domainName: {{ domain }}
-# Name of the VSD user in admin group
-vsdUser: {{ vsd_user }}
-# IP address and port number of master API server
-masterApiServer: {{ api_server }}
-# REST server URL 
-nuageMonRestServer: {{ nuage_mon_rest_server_url }}
-# Bridge name for the docker bridge
-dockerBridgeName: {{ docker_bridge }}
-# Certificate for connecting to the kubemon REST API
-nuageMonClientCert: {{ rest_client_cert }}
-# Key to the certificate in restClientCert
-nuageMonClientKey: {{ rest_client_key }} 
-# CA certificate for verifying the master's rest server
-nuageMonServerCA: {{ rest_server_ca_cert }}
-# Nuage vport mtu size
-interfaceMTU: {{ vport_mtu  }}
-# Logging level for the plugin
-# allowed options are: "dbg", "info", "warn", "err", "emer", "off"
-logLevel: {{ plugin_log_level }}
-- 
cgit v1.2.1