Update Aether config for Azure Central and MWC Edge
Change-Id: Id7865a62475b834fbe28997d414260eac88b9e5f
diff --git a/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml b/deployment-configs/aether/apps/common-cord-platform.yaml
similarity index 85%
rename from deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
rename to deployment-configs/aether/apps/common-cord-platform.yaml
index 79c9412..9602e21 100644
--- a/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
+++ b/deployment-configs/aether/apps/common-cord-platform.yaml
@@ -7,20 +7,19 @@
onos:
fullnameOverride: "cord-platform-onos"
+ images:
+ onos:
+ pullPolicy: 'IfNotPresent'
kafka:
fullnameOverride: "cord-platform-kafka"
logging:
- elasticsearch:
- fullnameOverride: "cord-platform-elasticsearch"
- kibana:
- fullnameOverride: "cord-platform-kibana"
- logstash:
- fullnameOverride: "cord-platform-logstash"
- fluentd-elasticsearch:
- fullnameOverride: "cord-platform-fluentd-elasticsearch"
+ enabled: false
nem-monitoring:
+ images:
+ kpi_exporter:
+ pullPolicy: 'IfNotPresent'
kpi_exporter:
# NOTE: set enabled=false for central cluster
enabled: true
diff --git a/deployment-configs/aether/apps/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global-nem-monitoring.yaml
index 9bc6472..64e7545 100644
--- a/deployment-configs/aether/apps/global-nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/global-nem-monitoring.yaml
@@ -28,6 +28,8 @@
- targets:
- cord-platform-prometheus-server.cord-platform-p-s5pp8.svc.product.central:80
- cord-platform-prometheus-server.cord-platform-p-6lcrm.svc.menlo.edge:80
+ - cord-platform-prometheus-server.cord-platform-p-dw2cc.svc.azure.central:80
+ - cord-platform-prometheus-server.cord-platform-p-vqzqg.svc.mwc.edge:80
extraScrapeConfigs: ""
grafana:
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-b7-mwc.yaml b/deployment-configs/aether/apps/production-accelleran-cu-b7-mwc.yaml
new file mode 100644
index 0000000..ed78824
--- /dev/null
+++ b/deployment-configs/aether/apps/production-accelleran-cu-b7-mwc.yaml
@@ -0,0 +1,18 @@
+images:
+ tags:
+ initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
+ nats: registry.aether.opennetworking.org/accelleran/vran-nats:20190121
+ redis: registry.aether.opennetworking.org/accelleran/vran-redis:20190121
+ vranL3: registry.aether.opennetworking.org/accelleran/vran-l3-fdd:onf-dns
+ pullPolicy: IfNotPresent
+config:
+ nats:
+ ip: 119.0.0.20
+ mme:
+ ip: 172.16.0.8
+ progran:
+ enabled: false
+ vran:
+ ports:
+ s1ap:
+ nodePort: 31413
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-mwc.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-mwc.yaml
new file mode 100644
index 0000000..8572747
--- /dev/null
+++ b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-mwc.yaml
@@ -0,0 +1,13 @@
+images:
+ tags:
+ initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
+ nats: registry.aether.opennetworking.org/aether/accelleran-cu-nats:v1.0.0
+ redis: registry.aether.opennetworking.org/aether/accelleran-cu-redis:v1.0.0
+ redisClient: registry.aether.opennetworking.org/aether/redis:5.0.6-alpine3.10
+ ric: registry.aether.opennetworking.org/aether/accelleran-cu-ric:v1.0.0
+ ricWeb: registry.aether.opennetworking.org/aether/accelleran-cu-ricweb:v1.0.0
+ depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
+ pullPolicy: IfNotPresent
+config:
+ nats:
+ ip: "119.0.0.20"
diff --git a/deployment-configs/aether/apps/production-accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-onf-menlo.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-accelleran-cbrs-common.yaml
rename to deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-onf-menlo.yaml
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-mwc.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-mwc.yaml
new file mode 100644
index 0000000..46d61ac
--- /dev/null
+++ b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-mwc.yaml
@@ -0,0 +1,16 @@
+images:
+ tags:
+ initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
+ vranL3: registry.aether.opennetworking.org/aether/accelleran-cu-l3-tdd:v1.0.2
+ depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
+ pullPolicy: IfNotPresent
+config:
+ mme:
+ ip: "10.168.0.204"
+ vranL3:
+ plmnId: "130501"
+ instanceId: "onfcell203"
+ tac: 203
+ ports:
+ s1ap:
+ nodePort: 31412
diff --git a/deployment-configs/aether/apps/production-accelleran-cbrs-cu-202.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-accelleran-cbrs-cu-202.yaml
rename to deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo.yaml
diff --git a/deployment-configs/aether/apps/production-cassandra-azure.yaml b/deployment-configs/aether/apps/production-cassandra-azure.yaml
new file mode 100644
index 0000000..9258e77
--- /dev/null
+++ b/deployment-configs/aether/apps/production-cassandra-azure.yaml
@@ -0,0 +1,11 @@
+fullnameOverride: "cassandra"
+image:
+ tag: "2.1.20"
+persistence:
+ enabled: true
+ storageClass: "hostpath"
+config:
+ cluster_size: 1
+ seed_size: 1
+ cluster_domain: "azure.central"
+ endpoint_snitch: "GossipingPropertyFileSnitch"
diff --git a/deployment-configs/aether/apps/production-cassandra.yaml b/deployment-configs/aether/apps/production-cassandra-gcp.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-cassandra.yaml
rename to deployment-configs/aether/apps/production-cassandra-gcp.yaml
diff --git a/deployment-configs/aether/apps/production-mcord-services-azure.yaml b/deployment-configs/aether/apps/production-mcord-services-azure.yaml
new file mode 100644
index 0000000..2c01b9c
--- /dev/null
+++ b/deployment-configs/aether/apps/production-mcord-services-azure.yaml
@@ -0,0 +1,18 @@
+progran:
+ enabled: false
+
+mcord-subscriber:
+ image:
+ repository: "omecproject/mcord-synchronizer"
+ tag: "comac-1.0.0"
+ pullPolicy: "IfNotPresent"
+
+onos-service:
+ kafkaService: "cord-platform-kafka"
+
+fabric:
+ enabled: true
+ kafkaService: "cord-platform-kafka"
+
+onosFabricRestHost: "cord-platform-onos-ui.cord-platform-p-vqzqg.svc.mwc.edge"
+onosFabricRestPort: 8181
diff --git a/deployment-configs/aether/apps/production-mcord-profile.yaml b/deployment-configs/aether/apps/production-mcord-services-gcp.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-mcord-profile.yaml
rename to deployment-configs/aether/apps/production-mcord-services-gcp.yaml
diff --git a/deployment-configs/aether/apps/production-omec-cp-azure.yaml b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
new file mode 100644
index 0000000..29f7039
--- /dev/null
+++ b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
@@ -0,0 +1,57 @@
+images:
+ tags:
+ hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
+ hss: "registry.aether.opennetworking.org/c3po-hss:1.1.1-bad"
+ mme: "registry.aether.opennetworking.org/openmme:1.1.1-bad"
+ spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.0"
+ pullPolicy: "Always"
+
+cassandra:
+ deploy: false
+
+resources:
+ enabled: true
+
+config:
+ clusterDomain: "azure.central"
+ spgwc:
+ apn: apn1
+ multiUpfs: true
+ s1uAddr: "119.0.0.4"
+ ueIpPool:
+ ip: 17.0.0.0
+ mask: 255.0.0.0
+ mme:
+ cfgFiles:
+ config.json:
+ mme:
+ mcc:
+ dig1: 7
+ dig2: 3
+ dig3: 2
+ mnc:
+ dig1: 1
+ dig2: 1
+ dig3: 1
+ hss:
+ acl:
+ oldTls: "*.azure.central"
+ bootstrap:
+ enabled: true
+ users:
+ - imsi: "732111000000420"
+ msisdn: "1122334455"
+ apn: apn1
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
+ - imsi: "732111000000421"
+ msisdn: "1122334455"
+ apn: apn1
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
+ mmes:
+ - id: 1
+ isdn: "19136246000"
+ unreachability: 1
diff --git a/deployment-configs/aether/apps/production-omec-cp.yaml b/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-omec-cp.yaml
rename to deployment-configs/aether/apps/production-omec-cp-gcp.yaml
diff --git a/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml b/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml
new file mode 100644
index 0000000..55dcd6f
--- /dev/null
+++ b/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml
@@ -0,0 +1,23 @@
+images:
+ tags:
+ spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
+ pullPolicy: "Always"
+
+config:
+ spgwu:
+ multiUpfs: true
+ cpComm:
+ addr: "spgwc-headless.omec.svc.azure.central"
+ s1u:
+ device: "s1u-net"
+ # NOTE: set different IP for each edge
+ ip: "119.0.0.4/24"
+ sgi:
+ device: "sgi-net"
+ # NOTE: set different IP for each edge
+ ip: "13.1.1.4/24"
+ dpName: "dp-b17"
+networks:
+ sgi:
+ # NOTE: set correct gateway for each edge
+ gateway: "13.1.1.250"
diff --git a/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml b/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
new file mode 100644
index 0000000..8f79776
--- /dev/null
+++ b/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
@@ -0,0 +1,23 @@
+images:
+ tags:
+ spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
+ pullPolicy: "Always"
+
+config:
+ spgwu:
+ multiUpfs: true
+ cpComm:
+ addr: "spgwc-headless.omec.svc.product.central"
+ s1u:
+ device: "s1u-net"
+ # NOTE: set different IP for each edge
+ ip: "119.0.0.3/24"
+ sgi:
+ device: "sgi-net"
+ # NOTE: set different IP for each edge
+ ip: "13.1.1.3/24"
+ dpName: "dp-cbrs"
+networks:
+ sgi:
+ # NOTE: set correct gateway for each edge
+ gateway: "13.1.1.250"
diff --git a/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-nokia.yaml b/deployment-configs/aether/apps/staging-accelleran-cu-cbrs-common.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-nokia.yaml
rename to deployment-configs/aether/apps/staging-accelleran-cu-cbrs-common.yaml
diff --git a/deployment-configs/aether/apps/staging-accelleran-cbrs-cu-203.yaml b/deployment-configs/aether/apps/staging-accelleran-cu-cbrs.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging-accelleran-cbrs-cu-203.yaml
rename to deployment-configs/aether/apps/staging-accelleran-cu-cbrs.yaml