Merge "[EDGEPOD-231] Add the new DP config for Intel Edge"
diff --git a/deployment-configs/aether/apps/global/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
index 2922cc1..6cd0952 100644
--- a/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
@@ -27,10 +27,9 @@
static_configs:
- targets:
- nem-monitoring-prometheus-server.nem-monitoring-p-s5pp8.svc.product.central:80
- - nem-monitoring-prometheus-server.nem-monitoring-p-6lcrm.svc.menlo.edge:80
- nem-monitoring-prometheus-server.nem-monitoring-p-dw2cc.svc.azure.central:80
- nem-monitoring-prometheus-server.nem-monitoring-p-vqzqg.svc.mwc.edge:80
- - nem-monitoring-prometheus-server.nem-monitoring-p-hbr5z.svc.intel.edge:80
+ - nem-monitoring-prometheus-server.nem-monitoring-p-ccrkh.svc.intel.edge:80
- job_name: 'mme-exporter-production'
metrics_path: /metrics
scrape_interval: 15s
diff --git a/deployment-configs/aether/apps/intel/omec-dp.yaml b/deployment-configs/aether/apps/intel/omec-dp-ngic.yaml
similarity index 91%
rename from deployment-configs/aether/apps/intel/omec-dp.yaml
rename to deployment-configs/aether/apps/intel/omec-dp-ngic.yaml
index 0b6cae8..0ee2f97 100644
--- a/deployment-configs/aether/apps/intel/omec-dp.yaml
+++ b/deployment-configs/aether/apps/intel/omec-dp-ngic.yaml
@@ -17,7 +17,7 @@
s1u:
device: "s1u-net"
# NOTE: set different IP for each edge
- ip: "10.212.74.67/27"
+ ip: "10.212.74.67/28"
sgi:
device: "sgi-net"
# NOTE: set different IP for each edge
@@ -26,4 +26,5 @@
networks:
sgi:
# NOTE: set correct gateway for each edge
+ mask: "255.255.255.224"
gateway: "10.212.74.126"
diff --git a/deployment-configs/aether/apps/intel/omec-upf.yaml b/deployment-configs/aether/apps/intel/omec-upf.yaml
new file mode 100644
index 0000000..c1d444b
--- /dev/null
+++ b/deployment-configs/aether/apps/intel/omec-upf.yaml
@@ -0,0 +1,36 @@
+images:
+ tags:
+ bess: "registry.central.aetherproject.net/upf-epc-bess:0.1.0-intel"
+ cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:0.1.0-intel"
+ pullPolicy: "IfNotPresent"
+
+nodeSelectors:
+ enabled: true
+ spgwu:
+ label: omec-upf
+ value: enabled
+
+config:
+ spgwu:
+ name: "dp-intel"
+ s1u:
+ device: "s1u"
+ ip: "10.212.74.81/28"
+ sgi:
+ device: "sgi"
+ ip: "10.212.74.97/27"
+ zmq:
+ spgwc:
+ addr: "spgwc-headless.omec.svc.product.central"
+
+networks:
+ enb:
+ subnet: "10.212.74.64/28"
+ ue:
+ subnet: "10.250.0.0/16"
+ sgi:
+ subnet: "10.212.74.96/27"
+ gateway: "10.212.74.126"
+ s1u:
+ subnet: "10.212.74.80/28"
+ gateway: "10.212.74.94"