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

---
 .../nuage_master/templates/nuage-openshift-monitor.j2 | 19 +++++++++++++++++++
 roles/nuage_master/templates/nuagekubemon.j2          | 19 -------------------
 2 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 roles/nuage_master/templates/nuage-openshift-monitor.j2
 delete mode 100644 roles/nuage_master/templates/nuagekubemon.j2

(limited to 'roles/nuage_master/templates')

diff --git a/roles/nuage_master/templates/nuage-openshift-monitor.j2 b/roles/nuage_master/templates/nuage-openshift-monitor.j2
new file mode 100644
index 000000000..db8c3d85e
--- /dev/null
+++ b/roles/nuage_master/templates/nuage-openshift-monitor.j2
@@ -0,0 +1,19 @@
+# .kubeconfig that includes the nuage service account
+kubeConfig: {{ kube_config }}
+# name of the nuage service account, or another account with 'cluster-reader'
+# permissions
+# Openshift master config file
+masterConfig: {{ master_config_yaml }} 
+# URL of the VSD Architect
+vsdApiUrl: {{ vsd_api_url }} 
+# API version to query against.  Usually "v3_2"
+vspVersion: {{ vsp_version }} 
+# File containing a VSP license to install.  Only necessary if no license has
+# been installed on the VSD Architect before, only valid for standalone vsd install
+# licenseFile: "/path/to/base_vsp_license.txt"
+# Name of the enterprise in which pods will reside
+enterpriseName: {{ enterprise }} 
+# Name of the domain in which pods will reside
+domainName: {{ domain }}
+# Location where logs should be saved
+log_dir: {{ nuage_openshift_monitor_log_dir }} 
diff --git a/roles/nuage_master/templates/nuagekubemon.j2 b/roles/nuage_master/templates/nuagekubemon.j2
deleted file mode 100644
index fb586bcee..000000000
--- a/roles/nuage_master/templates/nuagekubemon.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-# .kubeconfig that includes the nuage service account
-kubeConfig: {{ kube_config }}
-# name of the nuage service account, or another account with 'cluster-reader'
-# permissions
-# Openshift master config file
-openshiftMasterConfig: {{ master_config_yaml }} 
-# URL of the VSD Architect
-vsdApiUrl: {{ vsd_api_url }} 
-# API version to query against.  Usually "v3_2"
-vspVersion: {{ vsp_version }} 
-# File containing a VSP license to install.  Only necessary if no license has
-# been installed on the VSD Architect before, only valid for standalone vsd install
-# licenseFile: "/path/to/base_vsp_license.txt"
-# Name of the enterprise in which pods will reside
-enterpriseName: {{ enterprise }} 
-# Name of the domain in which pods will reside
-domainName: {{ domain }}
-# Location where logs should be saved
-log_dir: {{ nuagekubemon_log_dir }} 
-- 
cgit v1.2.3