From f8bda5c9ee1b5a0519fa5e7faa0fdd5b889e4e85 Mon Sep 17 00:00:00 2001 From: Mandeep Khinda Date: Mon, 11 Sep 2017 20:12:08 +0000 Subject: synching portal config with upstream on master branch there were changes to portals vm_init script and docker-compose process that needed to be ported to oom. src of config are on master in portal/deliveries/ reverted the docker image name changes. upstream master has introuced a "-" between apps, db and wms. these images were cauing NPEs during portal spring boot so went back to original image names until further notice. Issue-ID: OOM-276 Change-Id: I708628f4b375325f2f2b753d1a374699b763098a Signed-off-by: Mandeep Khinda --- .gitignore | 1 + .../webapps/etc/ECOMPDBCAPP/portal.properties | 2 - .../webapps/etc/ECOMPDBCAPP/system.properties | 4 +- .../webapps/etc/ECOMPPORTALAPP/fusion.properties | 1 - .../webapps/etc/ECOMPPORTALAPP/logback.xml | 285 +++++++++++++++++++++ .../etc/ECOMPPORTALAPP/openid-connect.properties | 1 - .../webapps/etc/ECOMPPORTALAPP/portal.properties | 1 - .../webapps/etc/ECOMPPORTALAPP/system.properties | 7 +- .../webapps/etc/ECOMPSDKAPP/system.properties | 2 - .../etc/ECOMPWIDGETMS/application.properties | 1 - .../portal/templates/portal-apps-deployment.yaml | 29 ++- kubernetes/portal/values.yaml | 2 + 12 files changed, 308 insertions(+), 28 deletions(-) create mode 100644 .gitignore create mode 100644 kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..decc205720 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +kubernetes/config/onap-parameters.yaml diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties index c98febbf8b..6dbbee8417 100755 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties @@ -9,7 +9,6 @@ user.attribute.name = user_attribute ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm # URL of the ECOMP Portal REST API -# ecomp.homer.att.com is a development machine ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi #Use REST API instead of UEB to fetch the functional menu data @@ -21,7 +20,6 @@ ueb_listeners_enable = false # Application key is used by session management ueb_app_key = MtRwsF16RdpHZ7eM - # The inbox name property should not be required when the REST API is used, # but in 1610 FuncMenuController logs ALARM if it cannot find this key. ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-TEST diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties index ade886e0c5..46048ec520 100755 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties @@ -5,7 +5,7 @@ db.driver = com.mysql.jdbc.Driver db.connectionURL = jdbc:mysql://portaldb.onap-portal:3306/dbca_os db.userName = root db.password = password -# db.encrypt_flag = false +db.encrypt_flag = false db.hib.dialect = org.hibernate.dialect.MySQLDialect db.min_pool_size = 5 db.max_pool_size = 10 @@ -60,6 +60,4 @@ instance_uuid = 12345678-90ab-cdef-1234-567890abcdef guard_notebook_url=https://todo_rcloud_link # Application base URL is a proper prefix of the on-boarded URL. - app_base_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPDBCAPP/ - diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties index 6746ba3d75..c92a57393e 100755 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties @@ -27,7 +27,6 @@ account_admin_role_id = 999 restricted_app_role_id = 900 # Home Page index html - home_page = /index.html authentication_mechanism =DBAUTH diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml new file mode 100644 index 0000000000..0c0d764701 --- /dev/null +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${applicationLoggerPattern} + + + + + + + + + + + + ${logDirectory}/${generalLogName}.log + + + ${logDirectory}/${generalLogName}.log.%d{yyyy-MM-dd}.zip + + 30 + + + ${applicationLoggerPattern} + + + + + + 256 + + true + + + + + + + + + + + + + + + + + + + ${logDirectory}/${auditLogName}.log + + + ${logDirectory}/${auditLogName}.log.%d{yyyy-MM-dd}.zip + + 30 + + + ${auditLoggerPattern} + + + + 256 + + + + + ${logDirectory}/${metricsLogName}.log + + + ${logDirectory}/${metricsLogName}.log.%d{yyyy-MM-dd}.zip + + 30 + + + ${metricsLoggerPattern} + + + + + + 256 + + + + + ${logDirectory}/${errorLogName}.log + + + ${logDirectory}/${errorLogName}.log.%d{yyyy-MM-dd}.zip + + 30 + + + ${errorLoggerPattern} + + + + + 256 + + + + + ${debugLogDirectory}/${debugLogName}.log + + + ${logDirectory}/${debugLogName}.log.%d{yyyy-MM-dd}.zip + + 30 + + + ${defaultLoggerPattern} + + + + + 256 + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties index 3c0a3f0b99..33c919b214 100755 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties @@ -1,4 +1,3 @@ authentication_server_url = http://portal.api.simpledemo.openecomp.org:8383/openid-connect-server-webapp/ ecomp_openid_connect_client = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/openid_connect_login ecomp_redirect_uri = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/welcome.htm - diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties index d4a7e3006e..dc6ef6ace2 100755 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties @@ -6,7 +6,6 @@ user.attribute.name = user_attribute # for single sign on ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm - # URL of the ECOMP Portal REST API ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties index 062b52c63d..d6115b1837 100755 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties @@ -46,7 +46,6 @@ sessiontimeout_feed_cron = 0 0/5 * * * ? * #Front end URL frontend_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/applicationsHome - #cookie domain cookie_domain = openecomp.org @@ -57,12 +56,9 @@ cookie_domain = openecomp.org # Online Unique UUID generator - https://www.uuidgenerator.net/ instance_uuid = 90bc9497-10e6-49fe-916b-dcdfaa972383 -ecomp_shared_context_rest_url= http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/context elastic_search_url = http:// contact_us_link = http:// user_guide_link = http:// -# ML - commented out this hardcoded test path -#temp_path = C:/Users/cfu/Desktop/temp # Contact Us page properties ush_ticket_url = http:// @@ -81,13 +77,14 @@ authenticate_user_server=http://portal.api.simpledemo.openecomp.org:8383/openid- #window width threshold to collapse left/right menu when page onload window_width_threshold_left_menu = 1400 window_width_threshold_right_menu = 1350 + # User notification refresh interval and duration, in seconds notification_update_rate = 90 notification_update_duration = 900 #Microservices Related Properties for Portal microservices.widget.protocol = http -microservices.widget.hostname = portal.api.simpledemo.openecomp.org +microservices.widget.hostname = portalwidgets.onap-portal 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/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties index d3ad9d4d3f..964c7c479e 100755 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties @@ -48,8 +48,6 @@ mylogins_feed_cron = 0 0/60 * * * ?; #sessiontimeout_feed_cron = 0 * * * * ? * my_login_feed_output_dir = /tmp/MyLogins -# ECOMP Portal Shared Context REST API URL -ecomp_shared_context_rest_url= http://portalapps.onap-portal:8989/ecompportal/context # Link shown in Help menu contact_us_link = https://todo_contact_us_link.com diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties index e0eb45122c..6e9f6c013f 100644 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties @@ -33,4 +33,3 @@ account.user.password=6APqvG4AU2rfLgCvMdySwQ== ## Jasypt Properties jasypt.encryptor.password=EncryptionKey - diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml index a0818fab1b..c6078678cd 100755 --- a/kubernetes/portal/templates/portal-apps-deployment.yaml +++ b/kubernetes/portal/templates/portal-apps-deployment.yaml @@ -64,31 +64,33 @@ spec: command: ["/bin/sh", "-c", "echo yes > /portal_root/boot.txt"] name: portalapps volumeMounts: - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/fusion/conf/fusion.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/fusion/conf/fusion.properties" name: portal-fusion-properties - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/classes/openid-connect.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/openid-connect.properties" name: portal-openid-connect-properties - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/conf/system.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/conf/system.properties" name: portal-system-properties - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/classes/portal.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/portal.properties" name: portal-portal-properties - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/fusion/conf/fusion.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/logback.xml" + name: portal-logback + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/fusion/conf/fusion.properties" name: dbcapp-fusion-properties - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/conf/system.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/conf/system.properties" name: dbcapp-system-properties - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/classes/portal.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/classes/portal.properties" name: dbcapp-portal-properties - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties" name: dbcapp-dbcapp-properties - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP/WEB-INF/conf/system.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/conf/system.properties" name: sdkapp-system-properties - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP/WEB-INF/classes/portal.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/classes/portal.properties" name: sdkapp-portal-properties - - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP/WEB-INF/fusion/conf/fusion.properties + - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/fusion/conf/fusion.properties" name: sdkapp-fusion-properties - mountPath: /portal_root/ name: portal-root - - mountPath: /opt/apache-tomcat-8.0.37/logs + - mountPath: "{{ .Values.onapPortal.webappsDir }}/logs" name: portal-logs ports: - containerPort: 8005 @@ -112,6 +114,9 @@ spec: - name: portal-portal-properties hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties + - name: portal-logback + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml - name: dbcapp-fusion-properties hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml index f4d1919904..da851e02c2 100644 --- a/kubernetes/portal/values.yaml +++ b/kubernetes/portal/values.yaml @@ -9,3 +9,5 @@ image: portalwms: nexus3.onap.org:10001/openecomp/portalwms:1.1-STAGING-latest ubuntuInit: oomk8s/ubuntu-init:1.0.0 ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc +onapPortal: + webappsDir: "/opt/apache-tomcat-8.0.37/webapps" \ No newline at end of file -- cgit 1.2.3-korg