fix the docker install script for app properties

Issue-ID: DCAEGEN2-1857

Change-Id: Ic0845500344d0b7c85183ed606413fc67ef52e51
Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>

2 files changed, 14 insertions, 15 deletions

diff --git a/ccsdk-app-os/docker-dashboard-installation.sh b/ccsdk-app-os/docker-dashboard-installation.sh
index 8cb9d48..4d7da13 100644
--- a/ccsdk-app-os/docker-dashboard-installation.sh
+++ b/ccsdk-app-os/docker-dashboard-installation.sh
@@ -33,14 +33,13 @@ rm -f /home/deployments/ccsdk-app*.war
 
 # Update dashboard.properties
 cat /home/deployments/ccsdk-app/WEB-INF/conf/dashboard.properties | \
-sed "s/^dev.is_encrypted.*$/dev.is_encrypted=false/g" | \
-sed "s~^dev.url.*$~dev.url = ${cfy_url}~g" | \
-sed "s~^dev.inventory.url.*$~dev.inventory.url = ${inventory_url}~g" | \
-sed "s~^dev.dhandler.url.*$~dev.dhandler.url = ${dhandler_url}~g" | \
-sed "s~^dev.consul.url.*$~dev.consul.url = ${consul_url}~g" | \
-sed "s/^dev.username.*$/dev.username = ${cloudify_user}/g" | \
-sed "s/^dev.password.*$/dev.password = ${cloudify_password}/g" | \
-sed "s/^controller.env.*$/controller.env = ${app_env}/g"  > /tmp/dash.prop
+sed "s~^site.primary.cloudify.url.*$~site.primary.cloudify.url = ${cfy_url}~" | \
+sed "s~^site.primary.consul.url.*$~site.primary.consul.url = ${consul_url}~" | \
+sed "s~^site.primary.inventory.url.*$~site.primary.inventory.url = ${inventory_url}~" | \
+sed "s~^site.primary.dhandler.url.*$~site.primary.dhandler.url = ${dhandler_url}~" | \
+sed "s/^site.primary.cloudify.username.*$/site.primary.cloudify.username = ${cloudify_user}/" | \
+sed "s~^site.primary.cloudify.password.*$~site.primary.cloudify.password = ${cloudify_password}~" | \
+sed "s/^controller.env.*$/controller.env = ${app_env}/" > /tmp/dash.prop
 mv /tmp/dash.prop /home/deployments/ccsdk-app/WEB-INF/conf/dashboard.properties
 
 # Update system.properties
diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
index a43f85c..b3b0359 100644
--- a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
@@ -31,15 +31,15 @@ controller.env = dev
 
 controller.site.list = primary
 
-site.primary.name = mtn23a 
-site.primary.cloudify.url = https://eom-orcl-d14.ecomp.idns.cip.att.com/api/v3.1
-site.primary.consul.url = https://eom-cnsl-d14.ecomp.idns.cip.att.com:9500/
-site.primary.inventory.url = https://eom-invt-d14.ecomp.idns.cip.att.com:30123 
-site.primary.dhandler.url = https://eom-dplh-d14.ecomp.idns.cip.att.com:30125/
-site.primary.dbcl.url = https://ecompc-dbclgui-dev-s5.ecomp.idns.cip.att.com:30162/dmaap-bc-app/doLogin 
+site.primary.name = onap 
+site.primary.cloudify.url = https://dcae-cloudify-manager/api/v3.1
+site.primary.consul.url = http://consul-server:8500
+site.primary.inventory.url = https://inventory:8080
+site.primary.dhandler.url = https://deployment-handler:8443
+site.primary.dbcl.url = https://dbclgui.com:30162/dmaap-bc-app/doLogin 
 site.primary.feed_m.url = https://feedM.com 
 site.primary.cloudify.username = admin
-site.primary.cloudify.password = Cloudify_local
+site.primary.cloudify.password = local
 site.primary.cloudify.is_encrypted = false