From 406776b56f7696e806eac86cc9a6f8b62b127c9c Mon Sep 17 00:00:00 2001 From: as761j Date: Wed, 25 Mar 2020 22:11:09 +0200 Subject: [PATCH] [RIC-213] Add olmnId and nearRtRicId to HelmChart + remove env var RIC_ID Signed-off-by: as761j Change-Id: If440ce84538b6342af4478f5c1b1f9b1429cff9f --- RECIPE_EXAMPLE/example_recipe.yaml | 5 +++-- helm/e2mgr/templates/configmap.yaml | 12 ++++++++++++ helm/e2mgr/values.yaml | 5 +++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/RECIPE_EXAMPLE/example_recipe.yaml b/RECIPE_EXAMPLE/example_recipe.yaml index 88287ff..35c32f1 100644 --- a/RECIPE_EXAMPLE/example_recipe.yaml +++ b/RECIPE_EXAMPLE/example_recipe.yaml @@ -101,8 +101,9 @@ e2mgr: name: ric-plt-e2mgr tag: 2.0.10 privilegedmode: false - env: - RIC_ID: "bbbccc-abcd0e/20" + globalRicId: + plmnId: 131014 + ricNearRtId: 556670 e2term: diff --git a/helm/e2mgr/templates/configmap.yaml b/helm/e2mgr/templates/configmap.yaml index 57ecf4f..fd7ae2d 100644 --- a/helm/e2mgr/templates/configmap.yaml +++ b/helm/e2mgr/templates/configmap.yaml @@ -130,4 +130,16 @@ data: {{- else }} keepAliveDelayMs: 120000 {{- end }} + + globalRicId: + {{- if hasKey .Values.e2mgr "plmnId" }} + plmnId: {{ .Values.e2mgr.plmnId }} + {{- else }} + plmnId: 131014 + {{- end }} + {{- if hasKey .Values.e2mgr "ricNearRtId" }} + ricNearRtId: {{ .Values.e2mgr.ricNearRtId }} + {{- else }} + ricNearRtId: 556670 + {{- end }} --- diff --git a/helm/e2mgr/values.yaml b/helm/e2mgr/values.yaml index 7de686c..c86b3bd 100644 --- a/helm/e2mgr/values.yaml +++ b/helm/e2mgr/values.yaml @@ -31,8 +31,9 @@ e2mgr: replicaCount: 1 - env: - RIC_ID: "bbbccc-abcd0e/20" + globalRicId: + plmnId: 131014 + ricNearRtId: 556670 # Service ports are now defined in -- 2.16.6