Customize simpldemo.onap.org DNS zone with rdm_str

Change-Id: I56d5ab5147251e2600e42d364cfaa3fa06a05e8e
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Issue-ID: OOM-615

9 files changed, 114 insertions, 54 deletions

diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh b/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh
index bbf47a9bac..a4ab371cf1 100755
--- a/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh
+++ b/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh
@@ -22,40 +22,40 @@ function configure_dns_designate() {
 
         echo "Create CNAMEs for $SIMPLEDEMO_ONAP_ORG_ZONE_NAME"
         # AAI
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c1.vm1.aai.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c2.vm1.aai.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c3.vm1.aai.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID aai.api.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID aai.ui.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID aai.searchservice.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c1.vm1.aai.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c2.vm1.aai.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c3.vm1.aai.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID aai.api.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID aai.ui.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.aai.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID aai.searchservice.$RANDOM_STRING.simpledemo.onap.org.
 
         # SDC
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.sdc.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c1.vm1.sdc.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.sdc.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c2.vm1.sdc.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.sdc.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c3.vm1.sdc.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.sdc.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c4.vm1.sdc.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.sdc.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c1.vm1.sdc.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.sdc.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c2.vm1.sdc.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.sdc.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c3.vm1.sdc.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.sdc.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c4.vm1.sdc.$RANDOM_STRING.simpledemo.onap.org.
 
         # Policy
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c1.vm1.policy.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c2.vm1.policy.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c3.vm1.policy.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c4.vm1.policy.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c5.vm1.policy.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c6.vm1.policy.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c7.vm1.policy.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c8.vm1.policy.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID policy.api.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c1.vm1.policy.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c2.vm1.policy.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c3.vm1.policy.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c4.vm1.policy.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c5.vm1.policy.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c6.vm1.policy.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c7.vm1.policy.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID c8.vm1.policy.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.policy.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID policy.api.$RANDOM_STRING.simpledemo.onap.org.
 
         # MR
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.mr.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID ueb.api.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.mr.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID ueb.api.$RANDOM_STRING.simpledemo.onap.org.
 
         # Open-O
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID msb.api.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID mvim.api.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID vnfsdk.api.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID vfc.api.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID uui.api.simpledemo.onap.org.
-        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID esr.api.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID msb.api.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID mvim.api.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID vnfsdk.api.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID vfc.api.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID uui.api.$RANDOM_STRING.simpledemo.onap.org.
+        openstack recordset create --type=CNAME --ttl=86400 --records=vm1.openo.$RANDOM_STRING.simpledemo.onap.org. $SIMPLEDEMO_ONAP_ORG_ZONE_ID esr.api.$RANDOM_STRING.simpledemo.onap.org.
     fi
 }
 
@@ -113,6 +113,7 @@ STACK_NAME="dcae"
 # DNS variables
 SIMPLEDEMO_ONAP_ORG_ZONE_NAME="simpledemo.onap.org."
 SIMPLEDEMO_ONAP_ORG_ZONE_ID=""
+RANDOM_STRING=""
 
 # Install required packages to interfact with OpenStack CLIs
 apt update -y
@@ -151,6 +152,10 @@ then
     # get the DCAE Boostrap VM ip, to configure Robot with it, for Healthcheck
     DCAE_CONTROLLER_IP=`openstack stack output show dcae dcae_floating_ip -c output_value -f yaml | awk '{ print $2}'`
     sed -i -e "s/DCAE_CONTROLLER_IP_HERE/$DCAE_CONTROLLER_IP/g" /opt/robot/vm_properties.py;
+
+    # Retrieve current deployment random string
+    RANDOM_STRING=`openstack stack output show dcae random_string -c output_value -f yaml | awk '{ print $2}'`
+    SIMPLEDEMO_ONAP_ORG_ZONE_NAME="$RANDOM_STRING.$SIMPLEDEMO_ONAP_ORG_ZONE_NAME"
 fi
 
 # Source OpenStack parameters for DNS Designate
diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env b/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env
index 6b7caadbf3..70b2587302 100644
--- a/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env
+++ b/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env
@@ -66,12 +66,12 @@ parameters:
   dns_ip_addr: DNS_FORWARDER_HERE
   dcae_ip_addr: DCAE_IP_ADDR_HERE
 
-  aai1_k8s_ip_addr: vm1.aai.simpledemo.onap.org
-  aai2_k8s_ip_addr: vm2.aai.simpledemo.onap.org
-  mr_k8s_ip_addr: vm1.mr.simpledemo.onap.org
-  sdc_k8s_ip_addr: vm1.sdc.simpledemo.onap.org
-  policy_k8s_ip_addr: vm1.policy.simpledemo.onap.org
-  openo_k8s_ip_addr: vm1.openo.simpledemo.onap.org
+  aai1_k8s_ip_addr: vm1.aai.__rand_str__.simpledemo.onap.org
+  aai2_k8s_ip_addr: vm2.aai.__rand_str__.simpledemo.onap.org
+  mr_k8s_ip_addr: vm1.mr.__rand_str__.simpledemo.onap.org
+  sdc_k8s_ip_addr: vm1.sdc.__rand_str__.simpledemo.onap.org
+  policy_k8s_ip_addr: vm1.policy.__rand_str__.simpledemo.onap.org
+  openo_k8s_ip_addr: vm1.openo.__rand_str__.simpledemo.onap.org
 
   ###########################
   #                         #
diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.yaml b/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.yaml
index 31a81169a6..12191bf86d 100644
--- a/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.yaml
+++ b/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.yaml
@@ -389,20 +389,68 @@ resources:
             __dcaeos_dnsaas_username__: { get_param: dnsaas_username }
             __dcaeos_dnsaas_password__: { get_param: dnsaas_password }
             # fixed private IPs
-            __mr_ip_addr__: { get_param: mr_k8s_ip_addr }
-            __policy_ip_addr__: { get_param: policy_k8s_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_k8s_ip_addr }
-            __openo_ip_addr__: { get_param: openo_k8s_ip_addr }
-            __aai1_ip_addr__: { get_param: aai1_k8s_ip_addr }
-            __aai2_ip_addr__: { get_param: aai2_k8s_ip_addr }
+            __mr_ip_addr__:
+              str_replace:
+                template: { get_param: mr_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __policy_ip_addr__:
+              str_replace:
+                template: { get_param: policy_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __sdc_ip_addr__:
+              str_replace:
+                template: { get_param: sdc_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __openo_ip_addr__:
+              str_replace:
+                template: { get_param: openo_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __aai1_ip_addr__:
+              str_replace:
+                template: { get_param: aai1_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __aai2_ip_addr__:
+              str_replace:
+                template: { get_param: aai2_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
             # floating IPs
             __dns_floating_ip_addr__: { get_param: dns_ip_addr }
-            __aai1_floating_ip_addr__: { get_param: aai1_k8s_ip_addr }
-            __aai2_floating_ip_addr__: { get_param: aai1_k8s_ip_addr }
-            __mrouter_floating_ip_addr__: { get_param: mr_k8s_ip_addr }
-            __sdc_floating_ip_addr__: { get_param: sdc_k8s_ip_addr }
-            __policy_floating_ip_addr__: { get_param: policy_k8s_ip_addr }
-            __openo_floating_ip_addr__: { get_param: openo_k8s_ip_addr }
+            __aai1_floating_ip_addr__:
+              str_replace:
+                template: { get_param: aai1_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __aai2_floating_ip_addr__:
+              str_replace:
+                template: { get_param: aai1_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __mrouter_floating_ip_addr__:
+              str_replace:
+                template: { get_param: mr_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __sdc_floating_ip_addr__:
+              str_replace:
+                template: { get_param: sdc_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __policy_floating_ip_addr__:
+              str_replace:
+                template: { get_param: policy_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __openo_floating_ip_addr__:
+              str_replace:
+                template: { get_param: openo_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
             __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
 
           template: |
@@ -480,4 +528,7 @@ resources:
 outputs:
   dcae_floating_ip:
     description: DCAE Boostrap container external IP Address
-    value: { get_attr: [ dcae_c_floating_ip, floating_ip_address ] }
\ No newline at end of file
+    value: { get_attr: [ dcae_c_floating_ip, floating_ip_address ] }
+  random_string:
+    description: Random generated string identifing this deployment
+    value: {get_attr: [random-str, value]}
\ No newline at end of file
diff --git a/kubernetes/config/values.yaml b/kubernetes/config/values.yaml
index 7c76260eed..16e6d48946 100644
--- a/kubernetes/config/values.yaml
+++ b/kubernetes/config/values.yaml
@@ -3,5 +3,5 @@ nsPrefix: onap
 dockerSharePath: /dockerdata-nfs
 image:
   repository: oomk8s/config-init
-  tag: 1.1.7
+  tag: 1.1.8
   pullPolicy: Always
diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml
index b2f23715c8..74ad957d6d 100644
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@ -18,7 +18,9 @@ spec:
      containers:
      - env:
        - name: MSB_ADDR
-         value: {{ .Values.msbgateway }}
+         valueFrom:
+           fieldRef:
+             fieldPath: status.hostIP
        - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
index 994fe94c03..641afa1ce0 100644
--- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
@@ -18,7 +18,9 @@ spec:
      containers:
      - env:
        - name: MSB_ADDR
-         value: "{{ .Values.msbgateway }}"
+         valueFrom:
+           fieldRef:
+             fieldPath: status.hostIP
        - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
index e2274b358f..0d80ac4442 100644
--- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
@@ -18,7 +18,9 @@ spec:
      containers:
      - env:
        - name: MSB_ADDR
-         value: "{{ .Values.msbgateway }}"
+         valueFrom:
+           fieldRef:
+             fieldPath: status.hostIP
        - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
index ff0f09af19..d856cdefb6 100644
--- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
@@ -18,7 +18,9 @@ spec:
      containers:
      - env:
        - name: MSB_ADDR
-         value: "{{ .Values.msbgateway }}"
+         valueFrom:
+           fieldRef:
+             fieldPath: status.hostIP
        - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 27f1c2f5c9..4d1596c17f 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -8,8 +8,4 @@ image:
   ocata: nexus3.onap.org:10001/onap/multicloud/openstack-ocata:v1.0.0
   windriver: nexus3.onap.org:10001/onap/multicloud/openstack-windriver:v1.0.0
 
-# domain name of msb gateway
-# It needs to be a FQDN because DCAE will have to
-# resolve this to be able to use the proxy DNS setup
-msbgateway: msb.api.simpledemo.onap.org
 msbPort: 80
\ No newline at end of file