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_master/handlers/main.yaml                 |  4 ++--
 roles/nuage_master/tasks/main.yaml                    | 16 ++++++++--------
 .../nuage_master/templates/nuage-openshift-monitor.j2 | 19 +++++++++++++++++++
 roles/nuage_master/templates/nuagekubemon.j2          | 19 -------------------
 roles/nuage_master/vars/main.yaml                     |  6 +++---
 5 files changed, 32 insertions(+), 32 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')

diff --git a/roles/nuage_master/handlers/main.yaml b/roles/nuage_master/handlers/main.yaml
index 635d8a419..5d133cf16 100644
--- a/roles/nuage_master/handlers/main.yaml
+++ b/roles/nuage_master/handlers/main.yaml
@@ -1,7 +1,7 @@
 ---
-- name: restart nuagekubemon
+- name: restart nuage-openshift-monitor
   sudo: true
-  service: name=nuagekubemon state=restarted
+  service: name=nuage-openshift-monitor state=restarted
 
 - name: restart master
   service: name={{ openshift.common.service_type }}-master state=restarted
diff --git a/roles/nuage_master/tasks/main.yaml b/roles/nuage_master/tasks/main.yaml
index a7baadc76..20d105b9e 100644
--- a/roles/nuage_master/tasks/main.yaml
+++ b/roles/nuage_master/tasks/main.yaml
@@ -1,15 +1,15 @@
 ---
-- name: Create directory /usr/share/nuagekubemon
+- name: Create directory /usr/share/nuage-openshift-monitor
   sudo: true
-  file: path=/usr/share/nuagekubemon state=directory  
+  file: path=/usr/share/nuage-openshift-monitor state=directory  
 
 - name: Create the log directory
   sudo: true
-  file: path={{ nuagekubemon_log_dir }} state=directory
+  file: path={{ nuage_openshift_monitor_log_dir }} state=directory
 
-- name: Install Nuage Kubemon
+- name: Install Nuage Openshift Monitor 
   sudo: true
-  yum: name={{ nuage_kubemon_rpm }} state=present
+  yum: name={{ nuage_openshift_rpm }} state=present
 
 - name: Run the service account creation script
   sudo: true
@@ -24,11 +24,11 @@
         - nuage.key
         - nuage.kubeconfig 
  
-- name: Create nuagekubemon.yaml
+- name: Create nuage-openshift-monitor.yaml
   sudo: true
-  template: src=nuagekubemon.j2 dest=/usr/share/nuagekubemon/nuagekubemon.yaml owner=root mode=0644
+  template: src=nuage-openshift-monitor.j2 dest=/usr/share/nuage-openshift-monitor/nuage-openshift-monitor.yaml owner=root mode=0644
   notify:
     - restart master
     - restart master api
     - restart master controllers
-    - restart nuagekubemon
+    - restart nuage-openshift-monitor
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 }} 
diff --git a/roles/nuage_master/vars/main.yaml b/roles/nuage_master/vars/main.yaml
index db901fea6..c489feabe 100644
--- a/roles/nuage_master/vars/main.yaml
+++ b/roles/nuage_master/vars/main.yaml
@@ -1,7 +1,7 @@
 openshift_master_config_dir: "{{ openshift.common.config_base }}/master"
 ca_cert: "{{ openshift_master_config_dir }}/ca.crt"
 admin_config: "{{ openshift.common.config_base }}/master/admin.kubeconfig"
-cert_output_dir: /usr/share/nuagekubemon
-kube_config: /usr/share/nuagekubemon/nuage.kubeconfig
-kubemon_yaml: /usr/share/nuagekubemon/nuagekubemon.yaml 
+cert_output_dir: /usr/share/nuage-openshift-monitor
+kube_config: /usr/share/nuage-openshift-monitor/nuage.kubeconfig
+kubemon_yaml: /usr/share/nuage-openshift-monitor/nuage-openshift-monitor.yaml 
 master_config_yaml: "{{ openshift_master_config_dir }}/master-config.yaml" 
-- 
cgit v1.2.1