Merge "Fix potential issue while install CSAR"

diff --combined src/main/resources/application.properties
index 1411b8b,646c577..0d58350
--- 1/src/main/resources/application.properties
--- 2/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@@ -124,21 -124,6 +124,21 @@@ clamp.config.sdc.template=classpath:/cl
  clamp.config.sdc.decode.service_ids=classpath:/clds/templates/sdc-decode-service_ids.json\r
  #\r
  #\r
 +# Configuration Settings for Policy Engine Components\r
 +clamp.config.policy.pdpUrl1=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123\r
 +clamp.config.policy.pdpUrl2=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123\r
 +clamp.config.policy.papUrl=http://vm1.policy.simpledemo.onap.org:8081/pap/ , testpap, alpha123\r
 +clamp.config.policy.notificationType=websocket\r
 +clamp.config.policy.notificationUebServers=localhost\r
 +clamp.config.policy.notificationTopic=\r
 +clamp.config.policy.clientId=myclientid\r
 +# base64 encoding\r
 +\r
 +clamp.config.policy.clientKey=5CE79532B3A2CB4D132FC0C04BF916A7\r
 +#DEVL for development\r
 +#TEST for Test environments\r
 +#PROD for prod environments\r
 +clamp.config.policy.policyEnvironment=TEST\r
  # General Policy request properties\r
  #\r
  clamp.config.policy.onap.name=DCAE\r
@@@ -206,6 -191,8 +206,8 @@@ clamp.config.clds.service.cache.invalid
  \r
  #DCAE Inventory Url Properties\r
  clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080\r
+ clamp.config.dcae.intentory.retry.interval=10000\r
+ clamp.config.dcae.intentory.retry.limit=3\r
  \r
  #DCAE Dispatcher Url Properties\r
  clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8080\r
@@@ -218,4 -205,4 +220,4 @@@ clamp.config.security.permission.type.c
  clamp.config.security.permission.type.filter.vf=permission-type-filter-vf\r
  clamp.config.security.permission.type.template=permission-type-template\r
  #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties\r
 -clamp.config.security.permission.instance=dev
 +clamp.config.security.permission.instance=dev\r