Remove namespace and assign in Jenkinsfile

Change-Id: I11a2a636375000fc18b00e26d10afe5b04f4ebc3
diff --git a/mcord/mcord-data-plane/templates/cm.yaml b/mcord/mcord-data-plane/templates/cm.yaml
index 37687d9..fe1ce19 100644
--- a/mcord/mcord-data-plane/templates/cm.yaml
+++ b/mcord/mcord-data-plane/templates/cm.yaml
@@ -16,7 +16,6 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ .Values.namespace }}
   name: ngicdp-config
 data:
   adc_rules.cfg: |
@@ -135,8 +134,8 @@
     [0]
     dp_comm_ip =  127.0.0.1
     dp_comm_port = 20
-    cp_comm_ip = ngic-cp-0.ngic-cp.{{ .Values.namespace }}.cluster.global
-    cp_comm_port = 21
+    cp_comm_ip = {{ .Values.controlplane_hostname }}
+    cp_comm_port = {{ .Values.controlplane_port }}
   meter_profile.cfg: |
     [GLOBAL]
     NUM_OF_IDX = 7