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
diff --git a/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml b/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
new file mode 100644
index 0000000..5551520
--- /dev/null
+++ b/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
@@ -0,0 +1,230 @@
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: network-attachment-definitions.k8s.cni.cncf.io
+spec:
+  group: k8s.cni.cncf.io
+  version: v1
+  scope: Namespaced
+  names:
+    plural: network-attachment-definitions
+    singular: network-attachment-definition
+    kind: NetworkAttachmentDefinition
+    shortNames:
+    - net-attach-def
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          properties:
+            config:
+                 type: string
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: multus
+rules:
+  - apiGroups: ["k8s.cni.cncf.io"]
+    resources:
+      - '*'
+    verbs:
+      - '*'
+  - apiGroups:
+      - ""
+    resources:
+      - pods
+      - pods/status
+    verbs:
+      - get
+      - update
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: multus
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: multus
+subjects:
+- kind: ServiceAccount
+  name: multus
+  namespace: kube-system
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: multus
+  namespace: kube-system
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: multus-cni-config
+  namespace: kube-system
+  labels:
+    tier: node
+    app: multus
+data:
+  # NOTE: If you'd prefer to manually apply a configuration file, you may create one here.
+  # In the case you'd like to customize the Multus installation, you should change the arguments to the Multus pod
+  # change the "args" line below from
+  # - "--multus-conf-file=auto"
+  # to:
+  # "--multus-conf-file=/tmp/multus-conf/70-multus.conf"
+  # Additionally -- you should ensure that the name "70-multus.conf" is the alphabetically first name in the
+  # /etc/cni/net.d/ directory on each node, otherwise, it will not be used by the Kubelet.
+  cni-conf.json: |
+    {
+      "name": "multus-cni-network",
+      "type": "multus",
+      "capabilities": {
+        "portMappings": true
+      },
+      "delegates": [
+        {
+          "cniVersion": "0.3.1",
+          "name": "default-cni-network",
+          "plugins": [
+            {
+              "type": "flannel",
+              "name": "flannel.1",
+                "delegate": {
+                  "isDefaultGateway": true,
+                  "hairpinMode": true
+                }
+              },
+              {
+                "type": "portmap",
+                "capabilities": {
+                  "portMappings": true
+                }
+              }
+          ]
+        }
+      ],
+      "kubeconfig": "/etc/cni/net.d/multus.d/multus.kubeconfig"
+    }
+---
+apiVersion: extensions/v1beta1
+kind: DaemonSet
+metadata:
+  name: kube-multus-ds-amd64
+  namespace: kube-system
+  labels:
+    tier: node
+    app: multus
+spec:
+  updateStrategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: multus
+    spec:
+      hostNetwork: true
+      nodeSelector:
+        beta.kubernetes.io/arch: amd64
+      tolerations:
+      - operator: Exists
+        effect: NoSchedule
+      serviceAccountName: multus
+      containers:
+      - name: kube-multus
+        image: nfvpe/multus:v3.2
+        command: ["/entrypoint.sh"]
+        args:
+        - "--multus-conf-file=auto"
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "50Mi"
+          limits:
+            cpu: "100m"
+            memory: "50Mi"
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - name: cni
+          mountPath: /host/etc/cni/net.d
+        - name: cnibin
+          mountPath: /host/opt/cni/bin
+        - name: multus-cfg
+          mountPath: /tmp/multus-conf
+      volumes:
+        - name: cni
+          hostPath:
+            path: /etc/cni/net.d
+        - name: cnibin
+          hostPath:
+            path: /opt/cni/bin
+        - name: multus-cfg
+          configMap:
+            name: multus-cni-config
+            items:
+            - key: cni-conf.json
+              path: 70-multus.conf
+---
+apiVersion: extensions/v1beta1
+kind: DaemonSet
+metadata:
+  name: kube-multus-ds-ppc64le
+  namespace: kube-system
+  labels:
+    tier: node
+    app: multus
+spec:
+  updateStrategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        tier: node
+        app: multus
+    spec:
+      hostNetwork: true
+      nodeSelector:
+        beta.kubernetes.io/arch: ppc64le
+      tolerations:
+      - operator: Exists
+        effect: NoSchedule
+      serviceAccountName: multus
+      containers:
+      - name: kube-multus
+        # ppc64le support requires multus:latest for now. support 3.3 or later.
+        image: nfvpe/multus:latest-ppc64le
+        command: ["/entrypoint.sh"]
+        args:
+        - "--multus-conf-file=auto"
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "90Mi"
+          limits:
+            cpu: "100m"
+            memory: "90Mi"
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - name: cni
+          mountPath: /host/etc/cni/net.d
+        - name: cnibin
+          mountPath: /host/opt/cni/bin
+        - name: multus-cfg
+          mountPath: /tmp/multus-conf
+      volumes:
+        - name: cni
+          hostPath:
+            path: /etc/cni/net.d
+        - name: cnibin
+          hostPath:
+            path: /opt/cni/bin
+        - name: multus-cfg
+          configMap:
+            name: multus-cni-config
+            items:
+            - key: cni-conf.json
+              path: 70-multus.conf
diff --git a/deployment-configs/aether/clusters/production-central.yml b/deployment-configs/aether/clusters/production-azure-central.yml
similarity index 69%
copy from deployment-configs/aether/clusters/production-central.yml
copy to deployment-configs/aether/clusters/production-azure-central.yml
index 243dee1..2f1e45f 100644
--- a/deployment-configs/aether/clusters/production-central.yml
+++ b/deployment-configs/aether/clusters/production-azure-central.yml
@@ -1,17 +1,7 @@
-name: production-central
+name: production-azure-central
 rancher_kubernetes_engine_config:
   authentication:
     strategy: x509
-  cloud_provider:
-    name: gce
-    customCloudProvider: |-
-      [global]
-      project-id = m-cord
-      network-project-id = onf-vpn
-      network-name = default
-      subnetwork-name = default
-      regional = true
-      multizone = true
   ignore_docker_version: true
   ingress:
     provider: nginx
@@ -19,8 +9,6 @@
   monitoring:
     provider: none
   network:
-    options:
-      calico_cloud_provider: gce
     plugin: calico
   services:
     etcd:
@@ -41,18 +29,18 @@
       always_pull_images: false
       pod_security_policy: false
       service_node_port_range: 2000-36767
-      service_cluster_ip_range: 10.52.128.0/17
+      service_cluster_ip_range: 10.55.128.0/17
       extra_args:
         feature-gates: "SCTPSupport=True"
     kubelet:
-      cluster_domain: product.central
-      cluster_dns_server: 10.52.128.10
+      cluster_domain: azure.central
+      cluster_dns_server: 10.55.128.10
       fail_swap_on: false
       extra_args:
         feature-gates: "SCTPSupport=True"
     kube-controller:
-      cluster_cidr: 10.52.0.0/17
-      service_cluster_ip_range: 10.52.128.0/17
+      cluster_cidr: 10.55.0.0/17
+      service_cluster_ip_range: 10.55.128.0/17
       extra_args:
         feature-gates: "SCTPSupport=True"
     scheduler:
@@ -65,14 +53,6 @@
   addon_job_timeout: 30
   addons: |-
     ---
-    apiVersion: storage.k8s.io/v1
-    kind: StorageClass
-    metadata:
-      name: zonal-ssd
-    provisioner: kubernetes.io/gce-pd
-    parameters:
-      type: pd-ssd
-    ---
     apiVersion: v1
     kind: ConfigMap
     metadata:
@@ -83,7 +63,7 @@
         .:53 {
             errors
             health
-            kubernetes product.central in-addr.arpa ip6.arpa {
+            kubernetes azure.central in-addr.arpa ip6.arpa {
               pods insecure
               upstream
               fallthrough in-addr.arpa ip6.arpa
@@ -96,10 +76,10 @@
             reload
             loadbalance
         }
-        menlo.edge:53 {
+        mwc.edge:53 {
             errors
             cache 30
-            forward . 10.53.128.10
+            forward . 10.54.128.10
         }
 
 windows_prefered_cluster: false
diff --git a/deployment-configs/aether/clusters/production-edge-mwc.yaml b/deployment-configs/aether/clusters/production-edge-mwc.yaml
index 5d5f017..040d4ae 100644
--- a/deployment-configs/aether/clusters/production-edge-mwc.yaml
+++ b/deployment-configs/aether/clusters/production-edge-mwc.yaml
@@ -81,8 +81,13 @@
             cache 30
             forward . 10.52.128.10
         }
+        azure.central:53 {
+            errors
+            cache 30
+            forward . 10.55.128.10
+        }
   addons_include:
-    - https://raw.githubusercontent.com/intel/multus-cni/master/images/multus-daemonset-pre-1.16.yml
+    - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
 
 windows_prefered_cluster: false
 docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/production-edge-onf-menlo.yml b/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
index 3a7bed9..9121b7f 100644
--- a/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
+++ b/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
@@ -82,7 +82,7 @@
             forward . 10.52.128.10
         }
   addons_include:
-    - https://raw.githubusercontent.com/intel/multus-cni/master/images/multus-daemonset-pre-1.16.yml
+    - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
 
 windows_prefered_cluster: false
 docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/production-central.yml b/deployment-configs/aether/clusters/production-gcp-central.yml
similarity index 95%
rename from deployment-configs/aether/clusters/production-central.yml
rename to deployment-configs/aether/clusters/production-gcp-central.yml
index 243dee1..5360c1c 100644
--- a/deployment-configs/aether/clusters/production-central.yml
+++ b/deployment-configs/aether/clusters/production-gcp-central.yml
@@ -101,6 +101,11 @@
             cache 30
             forward . 10.53.128.10
         }
+        mwc.edge:53 {
+            errors
+            cache 30
+            forward . 10.54.128.10
+        }
 
 windows_prefered_cluster: false
 docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/staging-edge-nokia.yml b/deployment-configs/aether/clusters/staging-edge-nokia.yml
index b750647..ba9ffdd 100644
--- a/deployment-configs/aether/clusters/staging-edge-nokia.yml
+++ b/deployment-configs/aether/clusters/staging-edge-nokia.yml
@@ -82,7 +82,7 @@
             forward . 10.47.128.10
         }
   addons_include:
-    - https://raw.githubusercontent.com/intel/multus-cni/master/images/multus-daemonset-pre-1.16.yml
+    - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
 
 windows_prefered_cluster: false
 docker_root_dir: /var/lib/docker