Merge "Fix dcae fe config"

2 files changed, 10 insertions, 5 deletions

diff --git a/docker/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_setup.rb b/docker/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_setup.rb
index 27b1a0f..068e7c1 100644
--- a/docker/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_setup.rb
+++ b/docker/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_setup.rb
@@ -1,14 +1,16 @@
 jetty_base = "#{node['JETTY_BASE']}"
 dcae_logs = "#{node['APP_LOG_DIR']}"
 
+dcae_be_vip = node['DCAE_BE_VIP']
+
 if node['disableHttp']
   protocol = "https"
-  dcae_be_vip = node['DCAE_BE_VIP']
   dcae_be_port = node['DCAE']['BE'][:https_port]
+  dcae_fe_port = node['DCAE']['FE'][:https_port]
 else
   protocol = "http"
-  dcae_be_vip  = "localhost"
   dcae_be_port = node['DCAE']['BE'][:http_port]
+  dcae_fe_port = node['DCAE']['FE'][:http_port]
 end
 
 printf("DEBUG: [%s]:[%s] disableHttp=[%s], protocol=[%s], dcae_be_vip=[%s], dcae_be_port=[%s] !!! \n", cookbook_name, recipe_name, node['disableHttp'], protocol, dcae_be_vip ,dcae_be_port )
@@ -41,7 +43,8 @@ template "dcae-fe-config" do
   variables ({
     :dcae_be_vip => dcae_be_vip,
     :dcae_be_port => dcae_be_port,
-    :protocol => protocol
+    :protocol => protocol,
+    :dcae_fe_port => dcae_fe_port
   })
 end
 
diff --git a/docker/chef-solo/cookbooks/Deploy-DCAE/templates/default/dcae-application.properties.erb b/docker/chef-solo/cookbooks/Deploy-DCAE/templates/default/dcae-application.properties.erb
index defa909..c8b6747 100644
--- a/docker/chef-solo/cookbooks/Deploy-DCAE/templates/default/dcae-application.properties.erb
+++ b/docker/chef-solo/cookbooks/Deploy-DCAE/templates/default/dcae-application.properties.erb
@@ -1,3 +1,5 @@
 server.port=<%= @dcae_fe_port %>
-server.context-path=/dcae
-beUrl=<%= @protocol %>://<%= @dcae_be_vip %>:<%= @dcae_be_port %>#demo
\ No newline at end of file
+# this is the context path in which the dcae_fe is exposed:
+server.context-path=/dcaed
+# this is the dcae-d be url which the dcaeProxy in the FE is delegating the request to
+beUrl=<%= @protocol %>://<%= @dcae_be_vip %>:<%= @dcae_be_port %>
\ No newline at end of file