Merge "[COMMON] Add monitoring to postgres"

[oom.git] / kubernetes / portal / components / portal-widget / resources / config / deliveries / properties / ONAPWIDGETMS / application.properties

diff --git a/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties b/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties
index a53dd2e..f5a900e 100644 (file)
--- a/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties
+++ b/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties
@@ -7,27 +7,26 @@ microservice.widget.location=/tmp
 \r
 ## App DB Properties\r
 spring.datasource.url=jdbc:mysql://portal-db:3306/portal\r
-spring.datasource.username=root\r
-spring.datasource.password=Aa123456\r
+spring.datasource.username=${PORTAL_DB_USER}\r
+spring.datasource.password=${PORTAL_DB_PASSWORD}\r
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect\r
 spring.database.driver.classname=org.mariadb.jdbc.Driver\r
 spring.jpa.show-sql=false\r
 spring.jpa.properties.hibernate.format_sql=false\r
 \r
 ## Basic Authentication Properties\r
-security.user.name=widget_user\r
-security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718)\r
+security.user.name=${WIDGET_USER}\r
+security.user.password=${WIDGET_PASSWORD}\r
 \r
 initialization.default.widgets=true\r
 initialization.widgetData.url=http://portal-app:{{.Values.global.portalPort}}/ONAPPORTAL/commonWidgets\r
 \r
 ## Account Basic Authentication Properties\r
-account.user.name=portal\r
-account.user.password=6APqvG4AU2rfLgCvMdySwQ==\r
+account.user.name=${ACC_USER}\r
+account.user.password=${ACC_PASSWORD}\r
 \r
 ## Certificate Properties\r
 #server.ssl.key-store=classpath:widget-keystore.p12\r
 #server.ssl.key-store-password=ENC(DiIYnAMab4u7rEW2yKhF9zBL00uU55q8)\r
 #server.ssl.keyStoreType=PKCS12\r
 #server.ssl.keyAlias=widget-microservice\r
-\r