diff options
| author |   sebdet <sd378r@intl.att.com> | 2018-09-03 11:23:13 +0200 |
|---|---|---|
| committer | sebdet <sd378r@intl.att.com> | 2018-09-03 11:23:13 +0200 |
| commit | f117756d051d5e8ffe6d8c257767d527b256265b (patch) | |
| tree | 5f4b17c0dbf4497692d22888ce0ee7554f9fca94 | |
| parent | 3c09a51d8b1b889cee61835f54c286ded075eda8 (diff) | |
Fix Healthcheck
Remove the certificate requirement in Clamp so that healthcheck works
Issue-ID: CLAMP-213
Change-Id: I4190f3db475d819d2e5f804b77cba480c4c172cb
Signed-off-by: sebdet <sd378r@intl.att.com>
| -rw-r--r-- | src/main/resources/application.properties | 9 | ||||
| -rw-r--r-- | src/main/resources/logback.xml | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b5069159..7bfe5d8b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -64,7 +64,7 @@ server.ssl.key-store-type=PKCS12 server.ssl.key-alias=clamp@clamp.onap.org ## Config part for Client certificates -server.ssl.client-auth=need +server.ssl.client-auth=want server.ssl.trust-store=classpath:/clds/aaf/truststoreONAPall.jks server.ssl.trust-store-password=changeit @@ -86,7 +86,7 @@ server.context_parameters.p-name=value #context parameter with p-name as key and camel.springboot.consumer-template-cache-size=1000 camel.springboot.producer-template-cache-size=1000 -camel.springboot.jmx-enabled=true +camel.springboot.jmx-enabled=false camel.defaultthreadpool.poolsize=10 camel.defaultthreadpool.maxpoolsize=20 camel.defaultthreadpool.maxqueuesize=1000 @@ -118,8 +118,8 @@ async.max.pool.size=20 async.queue.capacity=500 #For EELF logback file -#com.att.eelf.logging.path= -com.att.eelf.logging.file=logback-default.xml +#clamp.config.logback.path= +clamp.config.logback.filename=logback-default.xml #The log folder that will be used in logback.xml file clamp.config.log.path=/var/log/ONAP/clamp clamp.config.files.systemProperties=classpath:/system.properties @@ -228,6 +228,7 @@ clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage clamp.config.security.permission.type.cl.event=org.onap.clds.cl.event clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf clamp.config.security.permission.type.template=org.onap.clamp.clds.template +clamp.config.security.permission.type.tosca=com.att.clamp.clds.tosca #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties clamp.config.security.permission.instance=dev diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index dae39d3a..086cc535 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,9 +1,9 @@ <configuration scan="true" scanPeriod="60 seconds" debug="true"> <springProperty name="logbackFilePath" - source="com.att.eelf.logging.path" /> + source="clamp.config.logback.path" /> <springProperty name="logbackFileName" - source="com.att.eelf.logging.file" /> + source="clamp.config.logback.filename" /> <springProperty name="logDirectory" source="clamp.config.log.path" /> |