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/portal/resources/config/log/filebeat/filebeat.yml | 2 +- .../config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties | 2 +- .../config/portal-fe/webapps/etc/ONAPPORTAL/system.properties | 4 ++-- .../config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties | 2 +- .../config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties | 4 ++-- .../config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kubernetes/portal/resources') diff --git a/kubernetes/portal/resources/config/log/filebeat/filebeat.yml b/kubernetes/portal/resources/config/log/filebeat/filebeat.yml index f316b866af..89c6932577 100644 --- a/kubernetes/portal/resources/config/log/filebeat/filebeat.yml +++ b/kubernetes/portal/resources/config/log/filebeat/filebeat.yml @@ -21,7 +21,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.onap-log:5044"] + hosts: ["logstash.{{.Values.nsPrefix}}:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties index 4871b42288..6c89f6007c 100755 --- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties +++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties @@ -16,7 +16,7 @@ ueb_app_key = 7GkVcrO6sIDb3ngW ueb_app_secret = uCYgKjWKK5IxPGNNZzYSSWo9 ueb_app_mailbox_name = ECOMP-PORTAL-INBOX -ueb_url_list = dmaap.onap-message-router +ueb_url_list = dmaap.{{.Values.nsPrefix}} ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX # Consumer group name for UEB topic. diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties index 9085cee47f..345d222621 100755 --- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties +++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties @@ -1,6 +1,6 @@ #mysql db.driver = org.mariadb.jdbc.Driver -db.connectionURL = jdbc:mariadb:failover://portaldb.onap-portal:3306/portal +db.connectionURL = jdbc:mariadb:failover://portaldb.{{.Values.nsPrefix}}:3306/portal db.userName =root db.password =Aa123456 db.hib.dialect = org.hibernate.dialect.MySQLDialect @@ -84,7 +84,7 @@ notification_update_duration = 900 #Microservices Related Properties for Portal microservices.widget.protocol = http -microservices.widget.hostname = portalwidgets.onap-portal +microservices.widget.hostname = portalwidgets.{{.Values.nsPrefix}} microservices.widget.username = widget_user microservices.widget.password = KpuqIB08YHg+btG+pjX+sA== #This property won't be needed after consul is functional on VMs - diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties index e77a701798..7eeb913f2d 100755 --- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties +++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties @@ -30,7 +30,7 @@ ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi ueb_listeners_enable = false # UEB Configuration -ueb_url_list = dmaap.onap-message-router +ueb_url_list = dmaap.{{.Values.nsPrefix}} # ECOMP Portal listens on this UEB topic ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX # Replace these 3 default values with the ones for your specific App, diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties index d638abcca3..2f53286b56 100755 --- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties +++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties @@ -24,7 +24,7 @@ decryption_key = AGLDdG4D04BKm2IxIWEr8o== ########################################################################## db.driver = org.mariadb.jdbc.Driver -db.connectionURL = jdbc:mariadb://portaldb.onap-portal:3306/ecomp_sdk +db.connectionURL = jdbc:mariadb://portaldb.{{.Values.nsPrefix}}:3306/ecomp_sdk db.userName = root db.password = Aa123456 db.min_pool_size = 5 @@ -61,4 +61,4 @@ instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d guard_notebook_url= #authenticate user server -authenticate_user_server=http://portalapps.onap-portal:8383/openid-connect-server-webapp/allUsers +authenticate_user_server=http://portalapps.{{.Values.nsPrefix}}:8383/openid-connect-server-webapp/allUsers diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties index a5e55dc6d8..3450a6d414 100644 --- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties +++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties @@ -6,7 +6,7 @@ spring.http.multipart.max-request-size=128MB microservice.widget.location=/tmp ## App DB Properties -spring.datasource.url=jdbc:mysql://portaldb.onap-portal:3306/portal +spring.datasource.url=jdbc:mysql://portaldb.{{.Values.nsPrefix}}:3306/portal spring.datasource.username=root spring.datasource.password=Aa123456 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect -- cgit 1.2.3-korg