From: Mandeep Khinda <mandeep.khinda@amdocs.com>
Date: Fri, 8 Sep 2017 20:14:49 +0000 (+0000)
Subject: fixing bug in new config pod
X-Git-Tag: 2.0.0-ONAP~677
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=063a3ce97495362035652721b3e626d6ab60c31c

fixing bug in new config pod

-it appears the variable substitution was not working
and the config map was empty causing the config pod to fail.

I was sure I tested this...alas :'(

Issue-ID: OOM-277

Change-Id: I439d2e0d12f74e76c2fb0a2d44da8aaa473035a7
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
---

diff --git a/kubernetes/config/onap-parameters.yaml b/kubernetes/config/onap-parameters.yaml
index 62ccc83122..7ddaf4d4c3 100644
--- a/kubernetes/config/onap-parameters.yaml
+++ b/kubernetes/config/onap-parameters.yaml
@@ -11,4 +11,4 @@ OPENSTACK_KEYSTONE_URL: ""
 OPENSTACK_FLAVOUR_MEDIUM: ""
 OPENSTACK_SERVICE_TENANT_NAME: ""
 DMAAP_TOPIC: ""
-DEMO_ARTIFACTS_VERSION: ""
+DEMO_ARTIFACTS_VERSION: ""
\ No newline at end of file
diff --git a/kubernetes/config/templates/pod.yaml b/kubernetes/config/templates/pod.yaml
index 296ebba64c..c9bf7a907c 100644
--- a/kubernetes/config/templates/pod.yaml
+++ b/kubernetes/config/templates/pod.yaml
@@ -4,7 +4,7 @@ metadata:
   name: global-onap-configmap
   namespace: "{{ .Values.nsPrefix }}"
 data:
-  {{ (.Files.Glob "{{ .Values.parameterFile }}").AsConfig | indent 2 }}
+  {{ (.Files.Glob "onap-parameters.yaml").AsConfig | indent 2 }}
 ---
 apiVersion: v1
 kind: Pod
diff --git a/kubernetes/config/values.yaml b/kubernetes/config/values.yaml
index 329ed8ebee..12dda8de0f 100644
--- a/kubernetes/config/values.yaml
+++ b/kubernetes/config/values.yaml
@@ -1,7 +1,6 @@
 # Default values for config.
 nsPrefix: onap
 dockerSharePath: /dockerdata-nfs
-parameterFile: onap-parameters.yaml
 image:
   repository: oomk8s/config-init
   tag: 1.1.0