From 3535ab6d8da1a1ac91dff47b6e92f625df102e2a Mon Sep 17 00:00:00 2001
From: Vishal Patil <vishal.patil@nuagenetworks.net>
Date: Thu, 11 Feb 2016 10:05:29 -0500
Subject: Changes for new Nuage RPMS

---
 roles/nuage_node/tasks/main.yaml            |  6 +++---
 roles/nuage_node/templates/vsp-k8s.j2       | 14 --------------
 roles/nuage_node/templates/vsp-openshift.j2 | 14 ++++++++++++++
 roles/nuage_node/vars/main.yaml             | 10 +++++-----
 4 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 roles/nuage_node/templates/vsp-k8s.j2
 create mode 100644 roles/nuage_node/templates/vsp-openshift.j2

(limited to 'roles/nuage_node')

diff --git a/roles/nuage_node/tasks/main.yaml b/roles/nuage_node/tasks/main.yaml
index e0117bf71..c1e49902d 100644
--- a/roles/nuage_node/tasks/main.yaml
+++ b/roles/nuage_node/tasks/main.yaml
@@ -22,16 +22,16 @@
 
 - name: Copy the certificates and keys
   sudo: true
-  copy: src="/tmp/{{ item }}" dest="{{ vsp_k8s_dir }}/{{ item }}"
+  copy: src="/tmp/{{ item }}" dest="{{ vsp_openshift_dir }}/{{ item }}"
   with_items:
         - ca.crt
         - nuage.crt
         - nuage.key
         - nuage.kubeconfig 
 
-- name: Set the vsp-k8s.yaml 
+- name: Set the vsp-openshift.yaml 
   sudo: true
-  template: src=vsp-k8s.j2 dest={{ vsp_k8s_yaml }} owner=root mode=0644 
+  template: src=vsp-openshift.j2 dest={{ vsp_openshift_yaml }} owner=root mode=0644 
   notify:
     - restart vrs
     - restart node 
diff --git a/roles/nuage_node/templates/vsp-k8s.j2 b/roles/nuage_node/templates/vsp-k8s.j2
deleted file mode 100644
index 98d6c3a9c..000000000
--- a/roles/nuage_node/templates/vsp-k8s.j2
+++ /dev/null
@@ -1,14 +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 }}
-# IP address and port number of master API server
-masterApiServer: {{ api_server }}
-# Bridge name for the docker bridge
-dockerBridgeName: {{ docker_bridge }}
diff --git a/roles/nuage_node/templates/vsp-openshift.j2 b/roles/nuage_node/templates/vsp-openshift.j2
new file mode 100644
index 000000000..98d6c3a9c
--- /dev/null
+++ b/roles/nuage_node/templates/vsp-openshift.j2
@@ -0,0 +1,14 @@
+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 }}
+# IP address and port number of master API server
+masterApiServer: {{ api_server }}
+# Bridge name for the docker bridge
+dockerBridgeName: {{ docker_bridge }}
diff --git a/roles/nuage_node/vars/main.yaml b/roles/nuage_node/vars/main.yaml
index a6b7cf997..4975d17ed 100644
--- a/roles/nuage_node/vars/main.yaml
+++ b/roles/nuage_node/vars/main.yaml
@@ -1,9 +1,9 @@
 ---
 vrs_config: /etc/default/openvswitch
-vsp_k8s_dir: /usr/share/vsp-k8s
-vsp_k8s_yaml: "{{ vsp_k8s_dir }}/vsp-k8s.yaml"
-client_cert: "{{ vsp_k8s_dir }}/nuage.crt"
-client_key: "{{ vsp_k8s_dir }}/nuage.key"
-ca_cert: "{{ vsp_k8s_dir }}/ca.crt"
+vsp_openshift_dir: /usr/share/vsp-openshift
+vsp_openshift_yaml: "{{ vsp_openshift_dir }}/vsp-openshift.yaml"
+client_cert: "{{ vsp_openshift_dir }}/nuage.crt"
+client_key: "{{ vsp_openshift_dir }}/nuage.key"
+ca_cert: "{{ vsp_openshift_dir }}/ca.crt"
 api_server: "{{ openshift_node_master_api_url }}"
 docker_bridge: "docker0"
-- 
cgit v1.2.1