moving cp.cfg to cp.json

Change-Id: Ie342fea6a33ed4def0901cead484d4593871c224
diff --git a/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl b/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
index 12409af..b6d8fda 100644
--- a/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
+++ b/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
@@ -101,8 +101,8 @@
     {{ .opc }} \
     {{ .sqn }} \
     {{ $.Values.config.hss.hssdb }} \
-    $mme_identity \
-    $mme_realm
+    {{ .mme_identity }} \
+    {{ .mme_realm }}
 {{- end }}
 
 {{- range .Values.config.hss.bootstrap.staticusers }}
@@ -114,8 +114,8 @@
     {{ .opc }} \
     {{ .sqn }} \
     {{ $.Values.config.hss.hssdb }} \
-    $mme_identity \
-    $mme_realm \
+    {{ .mme_identity }} \
+    {{ .mme_realm }} \
     {{ .staticAddr }}
 {{- end }}
 
diff --git a/omec/omec-control-plane/templates/configmap-spgwc.yaml b/omec/omec-control-plane/templates/configmap-spgwc.yaml
index 11d0c80..372ba4c 100644
--- a/omec/omec-control-plane/templates/configmap-spgwc.yaml
+++ b/omec/omec-control-plane/templates/configmap-spgwc.yaml
@@ -60,6 +60,10 @@
     [IP_POOL_CONFIG]
     IP_POOL_IP= {{.Values.config.spgwc.ueIpPool.ip }}
     IP_POOL_MASK= {{ .Values.config.spgwc.ueIpPool.mask }}
+    [STATIC_IP_POOL_CONFIG]
+    IP_POOL_IP= {{.Values.config.spgwc.staticUeIpPool.ip }}
+    IP_POOL_MASK= {{ .Values.config.spgwc.staticUeIpPool.mask }}
+
   gx.conf: |
     Identity = {{ tuple "spgwc" "identity" . | include "omec-control-plane.diameter_endpoint" | quote }};
     Realm = {{ tuple "spgwc" "realm" . | include "omec-control-plane.diameter_endpoint" | quote }};