Refactor ONAP HEAT template config, part 3

- Consolidate serv.sh activation in generic config script
- Rename OPEN-O (open-o) -> MULTISERV (multiserv)
  - Resurce names in Heat template
  - File names
  - References in other installation scripts
- Rename dcae_c_ -> dcae_ in Heat template
- Minor clean up

Change-Id: If45a1f1e01933f828aa698c815e0a3f65810a208
Issue-ID: INT-526
Signed-off-by: Marco Platania <platania@research.att.com>

5 files changed, 40 insertions, 40 deletions

diff --git a/boot/bind_zones b/boot/bind_zones
index 168ed042..dd8a8907 100644
--- a/boot/bind_zones
+++ b/boot/bind_zones
@@ -82,7 +82,7 @@ vm1.aaf-sms.simpledemo.openecomp.org.	IN	A	sms_ip_addr
 
 vm1.mr.simpledemo.openecomp.org.	IN	A	mr_ip_addr
 
-vm1.openo.simpledemo.openecomp.org. IN  A   openo_ip_addr
+vm1.multiserv.simpledemo.openecomp.org. IN  A   multiserv_ip_addr
 
 vm1.music.simpledemo.openecomp.org. IN  A   music_ip_addr
 
@@ -141,13 +141,13 @@ sniro.api.simpledemo.openecomp.org.	IN	CNAME	vm1.robot.simpledemo.openecomp.org.
 aaf.api.simpledemo.openecomp.org.	IN	CNAME	vm1.aaf.simpledemo.openecomp.org.
 aaf-sms.api.simpledemo.openecomp.org.	IN	CNAME	vm1.aaf-sms.simpledemo.openecomp.org.
 
-;OPEN-O
-msb.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
-mvim.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
-vnfsdk.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
-vfc.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
-uui.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
-esr.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
+;MultiService
+msb.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
+mvim.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
+vnfsdk.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
+vfc.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
+uui.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
+esr.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
 
 ;MUSIC
 music.api.simpledemo.openecomp.org.	IN	CNAME	vm1.music.simpledemo.openecomp.org.
diff --git a/boot/bind_zones_onap b/boot/bind_zones_onap
index 2d6d5f26..a6b0275f 100644
--- a/boot/bind_zones_onap
+++ b/boot/bind_zones_onap
@@ -82,7 +82,7 @@ vm1.aaf-sms.simpledemo.onap.org.	IN	A	sms_ip_addr
 
 vm1.mr.simpledemo.onap.org.	IN	A	mr_ip_addr
 
-vm1.openo.simpledemo.onap.org. IN  A   openo_ip_addr
+vm1.multiserv.simpledemo.onap.org. IN  A   multiserv_ip_addr
 
 vm1.music.simpledemo.onap.org. IN  A   music_ip_addr
 
@@ -141,13 +141,13 @@ sniro.api.simpledemo.onap.org.	IN	CNAME	vm1.robot.simpledemo.onap.org.
 aaf.api.simpledemo.onap.org.	IN	CNAME	vm1.aaf.simpledemo.onap.org.
 aaf-sms.api.simpledemo.onap.org.	IN	CNAME	vm1.aaf-sms.simpledemo.onap.org.
 
-;OPEN-O
-msb.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
-mvim.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
-vnfsdk.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
-vfc.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
-uui.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
-esr.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
+;MultiService
+msb.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
+mvim.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
+vnfsdk.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
+vfc.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
+uui.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
+esr.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
 
 ;MUSIC
 music.api.simpledemo.onap.org.	IN	CNAME	vm1.music.simpledemo.onap.org.
diff --git a/boot/db_simpledemo_onap_org b/boot/db_simpledemo_onap_org
index 2bb5a332..add2cab8 100644
--- a/boot/db_simpledemo_onap_org
+++ b/boot/db_simpledemo_onap_org
@@ -82,7 +82,7 @@ vm1.clamp.simpledemo.onap.org.           IN      A       10.0.12.1
 c1.vm1.clamp.simpledemo.onap.org.        IN      A       10.0.12.1
 c2.vm1.clamp.simpledemo.onap.org.        IN      A       10.0.12.1
 
-vm1.openo.simpledemo.onap.org.	IN	A	10.0.14.1
+vm1.multiserv.simpledemo.onap.org.	IN	A	10.0.14.1
 
 vm1.music.simpledemo.onap.org.	IN	A	10.0.15.1
 
@@ -109,7 +109,7 @@ sdc.api.simpledemo.onap.org.	IN	CNAME	vm1.sdc.simpledemo.onap.org.
 ;DCAE
 dcae.api.simpledemo.onap.org.	IN	CNAME	vm1.dcae.simpledemo.onap.org.
 
-;MSO
+;SO
 mso.api.simpledemo.onap.org.	IN	CNAME	vm1.mso.simpledemo.onap.org.
 so.api.simpledemo.onap.org.	    IN	CNAME	vm1.mso.simpledemo.onap.org.
 
@@ -144,13 +144,13 @@ clamp.api.simpledemo.onap.org.	IN	CNAME	vm1.clamp.simpledemo.onap.org.
 aaf.api.simpledemo.onap.org.	IN	CNAME	vm1.aaf.simpledemo.onap.org.
 aaf-sms.api.simpledemo.onap.org.	IN	CNAME	vm1.aaf-sms.simpledemo.onap.org.
 
-;OPEN-O
-msb.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
-mvim.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
-vnfsdk.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
-vfc.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
-uui.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
-esr.api.simpledemo.onap.org. 	IN	CNAME   vm1.openo.simpledemo.onap.org.
+;MultiService
+msb.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
+mvim.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
+vnfsdk.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
+vfc.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
+uui.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
+esr.api.simpledemo.onap.org. 	IN	CNAME   vm1.multiserv.simpledemo.onap.org.
 
 ;MUSIC
 music.api.simpledemo.onap.org.	IN	CNAME	vm1.music.simpledemo.onap.org.
diff --git a/boot/db_simpledemo_openecomp_org b/boot/db_simpledemo_openecomp_org
index 23409d11..dc9a43a6 100644
--- a/boot/db_simpledemo_openecomp_org
+++ b/boot/db_simpledemo_openecomp_org
@@ -81,7 +81,7 @@ vm1.clamp.simpledemo.openecomp.org.           IN      A       10.0.12.1
 c1.vm1.clamp.simpledemo.openecomp.org.        IN      A       10.0.12.1
 c2.vm1.clamp.simpledemo.openecomp.org.        IN      A       10.0.12.1
 
-vm1.openo.simpledemo.openecomp.org.	IN	A	10.0.14.1
+vm1.multiserv.simpledemo.openecomp.org.	IN	A	10.0.14.1
 
 vm1.music.simpledemo.openecomp.org.	IN	A	10.0.15.1
 
@@ -108,7 +108,7 @@ sdc.api.simpledemo.openecomp.org.	IN	CNAME	vm1.sdc.simpledemo.openecomp.org.
 ;DCAE
 dcae.api.simpledemo.openecomp.org.	IN	CNAME	vm1.dcae.simpledemo.openecomp.org.
 
-;MSO
+;SO
 mso.api.simpledemo.openecomp.org.	IN	CNAME	vm1.mso.simpledemo.openecomp.org.
 so.api.simpledemo.openecomp.org.	IN	CNAME	vm1.mso.simpledemo.openecomp.org.
 
@@ -142,13 +142,13 @@ clamp.api.simpledemo.openecomp.org.	IN	CNAME	vm1.clamp.simpledemo.openecomp.org.
 ;AAF
 aaf.api.simpledemo.openecomp.org.	IN	CNAME	vm1.aaf.simpledemo.openecomp.org.
 
-;OPEN-O
-msb.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
-mvim.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
-vnfsdk.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
-vfc.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
-uui.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
-esr.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.openo.simpledemo.openecomp.org.
+;MultiService
+msb.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
+mvim.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
+vnfsdk.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
+vfc.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
+uui.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
+esr.api.simpledemo.openecomp.org. 	IN	CNAME   vm1.multiserv.simpledemo.openecomp.org.
 
 ;MUSIC
 music.api.simpledemo.openecomp.org.	IN	CNAME	vm1.music.simpledemo.openecomp.org.
diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
index 350e95b7..9a5b59b1 100755
--- a/boot/dcae2_vm_init.sh
+++ b/boot/dcae2_vm_init.sh
@@ -166,7 +166,7 @@ wait_for_multicloud_ready()
 	
     # wait till MultiCloud up and ready
     local MCHOST
-    MCHOST=$(cat /opt/config/openo_ip_addr.txt)
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
     local MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
     local MCMETHOD='-X GET'
     local MCRESP='200'
@@ -195,7 +195,7 @@ register_multicloud_pod25dns_with_aai()
 
     CLOUD_REGION="$(cat /opt/config/dnsaas_region.txt)"
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
-    MCIP="$(cat /opt/config/openo_ip_addr.txt)"
+    MCIP="$(cat /opt/config/multiserv_ip_addr.txt)"
     CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
 
     local RESPCODE
@@ -277,7 +277,7 @@ register_multicloud_pod25_with_aai()
     CLOUD_REGION="$(cat /opt/config/openstack_region.txt)"
     DNSAAS_CLOUD_REGION="$(cat /opt/config/dnsaas_region.txt)"
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
-    MCIP="$(cat /opt/config/openo_ip_addr.txt)"
+    MCIP="$(cat /opt/config/multiserv_ip_addr.txt)"
     CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
     KEYSTONE_URL="$(cat /opt/config/openstack_keystone_url.txt)"
     if [[ "$KEYSTONE_URL" == */v3 ]]; then
@@ -405,7 +405,7 @@ register_dns_zone_proxied_designate()
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
     if [ -z "$1" ]; then DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)"; else DCAE_ZONE="$1"; fi
     DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)"
-    MCHOST=$(cat /opt/config/openo_ip_addr.txt)
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
     MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
 
     MCDATA='-d "{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"'
@@ -578,7 +578,7 @@ delete_dns_zone()
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
     DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)"
     DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)"
-    MCHOST=$(cat /opt/config/openo_ip_addr.txt)
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
     MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
 
     local DCAE_DOMAIN
@@ -623,7 +623,7 @@ list_dns_zone()
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
     DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)"
     DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)"
-    MCHOST=$(cat /opt/config/openo_ip_addr.txt)
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
     MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
 
     MCDATA='"{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"'