Merge "[AAI] Update certs to be valid until Jan 2022"

diff --combined kubernetes/aai/components/aai-sparky-be/resources/config/application.properties
index a9bce0e,7f0fe8a..1269f25
--- 1/kubernetes/aai/components/aai-sparky-be/resources/config/application.properties
--- 2/kubernetes/aai/components/aai-sparky-be/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-sparky-be/resources/config/application.properties
@@@ -1,4 -1,3 +1,3 @@@
- {{/*
  # Copyright © 2018 Amdocs, Bell Canada, AT&T
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
@@@ -16,7 -15,6 +15,6 @@@
  #
  # disable the default thyme leaf icon on web-pages
  #
- */}}
  spring.mvc.favicon.enabled=false
  
  #
@@@ -24,14 -22,14 +22,14 @@@
  # and in the values.yaml change the internalPort to 9517
  #
  
 -spring.profiles.active=camel,ssl,fe-prod,oxm-schema-prod,oxm-default,resources,sync,portal
 +spring.profiles.active=camel,ssl,fe-prod,oxm-schema-prod,oxm-default,resources,aai-proxy
  
  portal.cadiFileLocation={{.Values.config.cadiFileLocation}}
  portal.cadiFileLocation={{.Values.config.cadiFileLocation}}
  searchservice.hostname={{.Values.global.searchData.serviceName}}
  searchservice.port=9509
  searchservice.client-cert=client-cert-onap.p12
- searchservice.client-cert-password=1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+ searchservice.client-cert-password=1xfz1qie1jf81b3s1ir91tag1h381cvr1kze1zli16kj1b301b4y16kb1zm01kzo1cw71gze1t9y1ivd1b461je21qiw1xf3
  searchservice.truststore=tomcat_keystore
  
  schema.ingest.file=${CONFIG_HOME}/schemaIngest.properties