From 233f977d8f9c4bdbe43cda910f885cc477a3cb64 Mon Sep 17 00:00:00 2001
From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 9 Jul 2020 13:41:59 +0000
Subject: [PATCH] obtaining 'osm' variables from osm instead of root

vnf_id, ns_id, ... will be under a global variable 'osm'

Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---
 .../eechart/charts/snmpexporter/templates/deployment.yaml     | 4 ++--
 snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml    | 4 ++--
 snmp_ee_vnf/helm-charts/eechart/values.yaml                   | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
index e037f05f..b4ffe301 100644
--- a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
+++ b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
@@ -47,8 +47,8 @@ spec:
       volumes:
         - name: config-volume
           hostPath: 
-            path: "/var/lib/osm/snmp_exporter/{{ .Values.global.vnf_id }}/"
+            path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id }}/"
         - name: init-config-volume
           configMap:
             name: snmp-init-config
-          
\ No newline at end of file
+          
diff --git a/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
index 1d175111..d4bc2cc3 100755
--- a/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+++ b/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
@@ -49,7 +49,7 @@ spec:
           name:  {{ include "eechart.fullname" . }}
       - name: snmp-config-volume
         hostPath: 
-          path: "/var/lib/osm/snmp_exporter/{{ .Values.global.vnf_id }}/"
+          path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id }}/"
       - name: vnf-mibs
         configMap:
           name: vnf-snmp-mibs
@@ -58,4 +58,4 @@ spec:
           name: vnf-snmp-generator
       - name: osm-ee
         hostPath:
-          path: /var/lib/osm/osm/osm_osm_packages/_data
\ No newline at end of file
+          path: /var/lib/osm/osm/osm_osm_packages/_data
diff --git a/snmp_ee_vnf/helm-charts/eechart/values.yaml b/snmp_ee_vnf/helm-charts/eechart/values.yaml
index 45f253f9..7006b5df 100755
--- a/snmp_ee_vnf/helm-charts/eechart/values.yaml
+++ b/snmp_ee_vnf/helm-charts/eechart/values.yaml
@@ -1,5 +1,6 @@
 global:
-  vnf_id: AVNFId
+  osm:
+    vnf_id: AVNFId
 
 # Default values for eechart.
 # This is a YAML-formatted file.
-- 
GitLab