summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2017-09-08 20:14:49 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2017-09-08 20:18:10 +0000
commit063a3ce97495362035652721b3e626d6ab60c31c (patch)
tree9852f24d0d356eb720ae039bcaab731e5cc1f4a8
parent89b39407da346a0ec34579efc8b181efada14b6d (diff)
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>
-rw-r--r--kubernetes/config/onap-parameters.yaml2
-rw-r--r--kubernetes/config/templates/pod.yaml2
-rw-r--r--kubernetes/config/values.yaml1
3 files changed, 2 insertions, 3 deletions
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