Merge "[RIC-213] Add olmnId and nearRtRicId to HelmChart + remove env var RIC_ID"

diff --combined RECIPE_EXAMPLE/example_recipe.yaml
index c86a166,35c32f1..d72e25d
--- 1/RECIPE_EXAMPLE/example_recipe.yaml
--- 2/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/RECIPE_EXAMPLE/example_recipe.yaml
@@@ -19,7 -19,7 +19,7 @@@
  #-------------------------------------------------------------------------
  
  common:
 -  releasePrefix: r3
 +  releasePrefix: r4
  
  # If a local docker registry is used, please specify it using the following option 
  #  localregistry: nexus3.o-ran-sc.org:10004
@@@ -101,8 -101,9 +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:
@@@ -171,15 -172,3 +172,15 @@@ o1mediator
      registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
      name: ric-plt-o1
      tag: 0.3.2
 +
 +xapponboarder:
 +  image:
 +   xapponboarder:
 +     registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
 +     name: xapp-onboarder
 +     tag: 1.0.0
 +   chartmuseum:
 +     registry: "docker.io"
 +     name: chartmuseum/chartmuseum
 +     tag: v0.8.2
 +  allow_redeploy: "True"