Merge "NONRTRIC Dmaapadapter config correction"

diff --combined nonrtric/helm/dmaapadapterservice/resources/config/application.yaml
index 8ec49f7,2fb7f45..cc357c4
--- 1/nonrtric/helm/dmaapadapterservice/resources/config/application.yaml
--- 2/nonrtric/helm/dmaapadapterservice/resources/config/application.yaml
+++ b/nonrtric/helm/dmaapadapterservice/resources/config/application.yaml
@@@ -38,7 -38,7 +38,7 @@@ logging
      org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
      org.oran.dmaapadapter: DEBUG
    file:
 -    name: /var/log/dmaap-adaptor-service/application.log
 +    name: /var/log/dmaap-adapter-service/application.log
  server:
     # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework.
     # See springboot documentation.
@@@ -47,7 -47,7 +47,7 @@@
     ssl:
        key-store-type: JKS
        key-store-password: policy_agent
 -      key-store: /opt/app/dmaap-adaptor-service/etc/cert/keystore.jks
 +      key-store: /opt/app/dmaap-adapter-service/etc/cert/keystore.jks
        key-password: policy_agent
        key-alias: policy_agent
  app:
@@@ -57,7 -57,7 +57,7 @@@
      # Note that the same keystore as for the server is used.
      trust-store-used: false
      trust-store-password: policy_agent
 -    trust-store: /opt/app/dmaap-adaptor-service/etc/cert/truststore.jks
 +    trust-store: /opt/app/dmaap-adapter-service/etc/cert/truststore.jks
      # Configuration of usage of HTTP Proxy for the southbound accesses.
      # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
      http.proxy-host:
@@@ -65,10 -65,12 +65,12 @@@
    ics-base-url: https://informationservice.nonrtric:9083
    # Location of the component configuration file. The file will only be used if the Consul database is not used;
    # configuration from the Consul will override the file.
 -  configuration-filepath: /opt/app/dmaap-adaptor-service/data/application_configuration.json
 +  configuration-filepath: /opt/app/dmaap-adapter-service/data/application_configuration.json
    dmaap-base-url: http://message-router.onap:3904
    # The url used to adress this component. This is used as a callback url sent to other components.
    dmaap-adapter-base-url: https://dmaapadapterservice.nonrtric:9088
    # KAFKA boostrap server. This is only needed if there are Information Types that uses a kafkaInputTopic
    kafka:
      bootstrap-servers: message-router-kafka.onap:9092
+   # If the file name is empty, no authorization token is used
+   auth-token-file:

diff --combined smo-install/oran_oom/dmaapadapterservice/resources/config/application.yaml
index 8ec49f7,2fb7f45..cc357c4
--- 1/smo-install/oran_oom/dmaapadapterservice/resources/config/application.yaml
--- 2/smo-install/oran_oom/dmaapadapterservice/resources/config/application.yaml
+++ b/smo-install/oran_oom/dmaapadapterservice/resources/config/application.yaml
@@@ -38,7 -38,7 +38,7 @@@ logging
      org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
      org.oran.dmaapadapter: DEBUG
    file:
 -    name: /var/log/dmaap-adaptor-service/application.log
 +    name: /var/log/dmaap-adapter-service/application.log
  server:
     # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework.
     # See springboot documentation.
@@@ -47,7 -47,7 +47,7 @@@
     ssl:
        key-store-type: JKS
        key-store-password: policy_agent
 -      key-store: /opt/app/dmaap-adaptor-service/etc/cert/keystore.jks
 +      key-store: /opt/app/dmaap-adapter-service/etc/cert/keystore.jks
        key-password: policy_agent
        key-alias: policy_agent
  app:
@@@ -57,7 -57,7 +57,7 @@@
      # Note that the same keystore as for the server is used.
      trust-store-used: false
      trust-store-password: policy_agent
 -    trust-store: /opt/app/dmaap-adaptor-service/etc/cert/truststore.jks
 +    trust-store: /opt/app/dmaap-adapter-service/etc/cert/truststore.jks
      # Configuration of usage of HTTP Proxy for the southbound accesses.
      # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
      http.proxy-host:
@@@ -65,10 -65,12 +65,12 @@@
    ics-base-url: https://informationservice.nonrtric:9083
    # Location of the component configuration file. The file will only be used if the Consul database is not used;
    # configuration from the Consul will override the file.
 -  configuration-filepath: /opt/app/dmaap-adaptor-service/data/application_configuration.json
 +  configuration-filepath: /opt/app/dmaap-adapter-service/data/application_configuration.json
    dmaap-base-url: http://message-router.onap:3904
    # The url used to adress this component. This is used as a callback url sent to other components.
    dmaap-adapter-base-url: https://dmaapadapterservice.nonrtric:9088
    # KAFKA boostrap server. This is only needed if there are Information Types that uses a kafkaInputTopic
    kafka:
      bootstrap-servers: message-router-kafka.onap:9092
+   # If the file name is empty, no authorization token is used
+   auth-token-file: