From 8bfc6cf8c3d338c84c48201f7a4f274958e721a9 Mon Sep 17 00:00:00 2001 From: BorislavG Date: Tue, 27 Feb 2018 15:04:26 +0000 Subject: Run all components in one namespace Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e Issue-ID: OOM-722 Signed-off-by: BorislavG --- kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties | 4 ++-- .../aai/resources/config/sparky-be/appconfig/elasticsearch.properties | 4 ++-- .../aai/resources/config/sparky-be/appconfig/portal/portal.properties | 4 ++-- .../resources/config/sparky-be/appconfig/search-service.properties | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kubernetes/aai/resources/config/sparky-be') diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties index 3b4542889e..aaca346760 100644 --- a/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties +++ b/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties @@ -6,7 +6,7 @@ # # The ip address/hostname and port to the desired AAI instance # -aai.rest.host=aai-service.onap-aai +aai.rest.host=aai-service.{{.Values.nsPrefix}} aai.rest.port=8443 ############################## REST ############################## @@ -84,4 +84,4 @@ aai.ssl.truststore.type=jks aai.taskProcessor.maxConcurrentWorkers=5 aai.taskProcessor.transactionRateControllerEnabled=false aai.taskProcessor.numSamplesPerThreadForRunningAverage=100 -aai.taskProcessor.targetTPS=100 \ No newline at end of file +aai.taskProcessor.targetTPS=100 diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties index 82b5af39ab..99aea27d9e 100644 --- a/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties +++ b/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties @@ -7,7 +7,7 @@ # The ip address/hostname and port to the desired AAI instance # For development it's recommended to use a local instance of ES # -elasticsearch.ipAddress=elasticsearch.onap-aai +elasticsearch.ipAddress=aai-elasticsearch.{{.Values.nsPrefix}} elasticsearch.httpPort=9200 elasticsearch.javaApiPort=8443 @@ -69,4 +69,4 @@ elasticsearch.taskProcessor.maxConcurrentWorkers=5 elasticsearch.taskProcessor.transactionRateControllerEnabled=false elasticsearch.taskProcessor.numSamplesPerThreadForRunningAverage=100 elasticsearch.taskProcessor.targetTPS=100 -elasticsearch.clusterName=ES_AAI_LOCALHOST \ No newline at end of file +elasticsearch.clusterName=ES_AAI_LOCALHOST diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties index 33d91cf88a..90147362b0 100644 --- a/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties +++ b/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties @@ -7,10 +7,10 @@ portal.api.impl.class = org.openecomp.sparky.security.portal.PortalRestAPIServic # Instance of ECOMP Portal where the app has been on-boarded # use insecure http for dev purposes to avoid self-signed certificate -ecomp_rest_url = http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi +ecomp_rest_url = http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi # Standard global logon page -ecomp_redirect_url = http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm +ecomp_redirect_url = http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm # Name of cookie to extract on login request csp_cookie_name = EPService diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties index 5f4985a5f2..57e34759d3 100644 --- a/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties +++ b/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties @@ -6,7 +6,7 @@ # # The ip address/hostname and port to the desired Search Data Service instance # -search-service.ipAddress=search-data-service.onap-aai +search-service.ipAddress=search-data-service.{{.Values.nsPrefix}} search-service.httpPort=9509 ############################## Indexes ############################## @@ -29,4 +29,4 @@ search-service.type=default ############################## Certs ############################## search-service.ssl.cert-name=client-cert-onap.p12 search-service.ssl.keystore-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 -search-service.ssl.keystore=tomcat_keystore \ No newline at end of file +search-service.ssl.keystore=tomcat_keystore -- cgit 1.2.3-korg