From: Mandeep Khinda Date: Wed, 25 Oct 2017 19:59:11 +0000 (+0000) Subject: Merge "No-wait namespace deletion option in deleteAll" X-Git-Tag: 2.0.0-ONAP~597 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=017d2ed22a0775d1c9637a355e050bf51108a9ed;hp=715e36b956881b55bc24f8c8eed1d60eaf744dfa;p=oom.git Merge "No-wait namespace deletion option in deleteAll" --- diff --git a/kubernetes/aai/resources/resources/conf/logback.xml b/kubernetes/aai/resources/resources/conf/logback.xml index bf334dfb0e..6cfc293f46 100644 --- a/kubernetes/aai/resources/resources/conf/logback.xml +++ b/kubernetes/aai/resources/resources/conf/logback.xml @@ -61,7 +61,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -85,7 +85,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -107,7 +107,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -126,7 +126,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -150,7 +150,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -172,7 +172,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -191,7 +191,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -210,7 +210,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -313,16 +313,16 @@ - + - + - + - + diff --git a/kubernetes/aai/resources/traversal/conf/logback.xml b/kubernetes/aai/resources/traversal/conf/logback.xml index 825fac9b47..fb8d8a53bf 100644 --- a/kubernetes/aai/resources/traversal/conf/logback.xml +++ b/kubernetes/aai/resources/traversal/conf/logback.xml @@ -60,7 +60,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -84,7 +84,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -106,7 +106,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -125,7 +125,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -149,7 +149,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -171,7 +171,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -190,7 +190,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -209,7 +209,7 @@ ${maxHistory} ${totalSizeCap} - + ${pattern} @@ -312,16 +312,16 @@ - + - + - + - + diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml index 3f2bda3d6c..f800c446eb 100644 --- a/kubernetes/aai/templates/modelloader-deployment.yaml +++ b/kubernetes/aai/templates/modelloader-deployment.yaml @@ -53,7 +53,7 @@ spec: path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/" - name: filebeat-conf hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml - name: aai-model-loader-logs emptyDir: {} - name: aai-model-loader-filebeat diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/kubectl b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/kubectl old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/data-router-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/data-router-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/gremlin-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/gremlin-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/model-loader-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/model-loader-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-be-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-be-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-cs-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-cs-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-fe-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-fe-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-titan-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-titan-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sparky-be-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sparky-be-script.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/tabular-db-availability.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/tabular-db-availability.sh old mode 100644 new mode 100755 diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties deleted file mode 100755 index 7415363e4e..0000000000 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Properties for the Data Bus Controller webapp -dmaap.rest.url.list = http://dcae-collector-dmaapbc:18080/webapi -# webapp's mechid is sent to DCAE for authorization -dmaap.mechid.name = m06672@dbcapp.dmaap.dcae.att.com -# encrypted with CipherUtil -dmaap.mechid.password = /F1vRhga1Ijw7yRFFj6R5A== -# Valid access methods are "dao" and "rest" -profile.access.method = dao diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties deleted file mode 100755 index d49d602376..0000000000 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties +++ /dev/null @@ -1,34 +0,0 @@ -# login settings -login_method_backdoor = backdoor -login_method_attribute_name = login_method -login_method_csp = csp -login_method_web_junction = web_junction - -#login message -login.error.hrid.empty = Login failed, please contact system administrator. -login.error.hrid.not-found = User not found, please contact system administrator. -login.error.user.inactive = Account is disabled, please contact system administrator. - -authentication_mechanism = DBAUTH - -user_attribute_name = user - -# User Session settings -roles_attribute_name = roles -role_functions_attribute_name = role_functions - -# POST settings -post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory -post_provider_url = todo_ldap -post_security_principal = ou=people,o=org,c=us -post_max_result_size = 499 - -# menu settings -menu_query_name = menuData -application_menu_set_name = APP -application_menu_attribute_name = applicationMenuData -business_direct_menu_set_name = BD -business_direct_menu_attribute_name = businessDirectMenuData - -# Role settings -sys_admin_role_id = 1 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 deleted file mode 100755 index 6dbbee8417..0000000000 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Properties read by ECOMP Framework library, ecompFW.jar - -portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl -portal.api.prefix = /api -max.idle.time = 5 -user.attribute.name = user_attribute - -# Legacy property TODO -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 - -#Use REST API instead of UEB to fetch the functional menu data -use_rest_for_functional_menu=true - -# Don't fetch functional menu via UEB in 1610. -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 deleted file mode 100755 index 46048ec520..0000000000 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties +++ /dev/null @@ -1,63 +0,0 @@ -#Local -app_display_name = DMaaP Bus Ctlr - -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.hib.dialect = org.hibernate.dialect.MySQLDialect -db.min_pool_size = 5 -db.max_pool_size = 10 -hb.dialect = org.hibernate.dialect.MySQLDialect -hb.show_sql = false -hb.db_reconnect = true -hb.idle_connection_test_period = 3600 - -# Directory with the Quantum.lic file -files_path = /opt/app/tomcat/webapps/dmaap-bc-app/WEB-INF/dbcapp - -application_user_id = 30000 -post_default_role_id = 16 -clustered = true - -#Enable Fusion Mobile capabilities for the application -mobile_enable = false - -# Cache config file is needed on the classpath -cache_config_file_path = /WEB-INF/classes/cache.ccf -cache_switch = 199 -cache_load_on_startup = false - -user_name = fullName -decryption_key = AGLDdG4D04BKm2IxIWEr8o== - -#element map files -element_map_file_path = /tmp -element_map_icon_path = app/fusionapp/icons/ - -# Quartz is not used by the DBC application -# log_cron = -# mylogins_feed_cron = -# sessiontimeout_feed_cron = -# my_login_feed_output_dir = - -# ECOMP Portal Shared Context REST API URL is not used by the DBC application -# ecomp_shared_context_rest_url = - -contact_us_link = https://todo_contact_us_link - -# An Unique 128-bit value defined to identify a specific version -# of an application deployed on a specific virtual machine. -# This value must be generated and updated by the application -# which is using the ECOMP SDK at the time of its deployment. -# Online Unique UUID generator - https://www.uuidgenerator.net/ -# ID generated for DBC to supply to EELF -# A bogus value is cached in SCM: 12345678-.. -instance_uuid = 12345678-90ab-cdef-1234-567890abcdef - -# R Cloud feature -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 c92a57393e..20285e3677 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 @@ -1,5 +1,5 @@ # domain settings -#domain_class_location = +#domain_class_location = # validator settings #default_error_message = Default error message @@ -31,7 +31,7 @@ home_page = /index.html authentication_mechanism =DBAUTH -login.error.hrid.empty = Login failed, please contact system administrator. +login.error.hrid.empty = Login failed, please contact system administrator. login.error.hrid.not-found = User not found, please contact system administrator. login.error.user.inactive = Account is disabled, please contact system administrator. @@ -40,7 +40,7 @@ login.error.user.inactive = Account is disabled, please contact system administr # health_poll_interval_seconds = 5 # -# If a component is down a log entry will be written that triggers an alert. This parameter specifies how often this alert should be triggered +# If a component is down a log entry will be written that triggers an alert. This parameter specifies how often this alert should be triggered # if the component remains down. For example a value of 30, would translate to 30 * 60 seconds = 1800 seconds, or every 30 minutes # health_fail_alert_every_x_intervals = 30 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 index 0c0d764701..2c319e03a3 100644 --- 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 @@ -1,27 +1,45 @@ - @@ -42,35 +60,35 @@ - - + - + - + - + - - - @@ -83,7 +101,7 @@ - @@ -109,65 +127,65 @@ - - - - - - - - - - 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 dc6ef6ace2..0863ef5fc2 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 @@ -1,4 +1,5 @@ -portal.api.impl.class = org.openecomp.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl +# Not used by portal +portal.api.impl.class = org.onap.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl.not.used.by.portal portal.api.prefix = /api max.idle.time = 5 user.attribute.name = user_attribute @@ -11,7 +12,7 @@ ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/aux ueb_listeners_enable = true -ueb_app_key = 7GkVcrO6sIDb3ngW +ueb_app_key = 7GkVcrO6sIDb3ngW ueb_app_secret = uCYgKjWKK5IxPGNNZzYSSWo9 ueb_app_mailbox_name = ECOMP-PORTAL-INBOX 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 d6115b1837..2cb38443a6 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 @@ -1,8 +1,8 @@ #mysql -db.driver = com.mysql.jdbc.Driver -db.connectionURL = jdbc:mysql://portaldb.onap-portal:3306/portal +db.driver = org.mariadb.jdbc.Driver +db.connectionURL = jdbc:mariadb:failover://portaldb.onap-portal:3306/portal db.userName =root -db.password =password +db.password =Aa123456 db.hib.dialect = org.hibernate.dialect.MySQLDialect db.min_pool_size = 5 db.max_pool_size = 10 @@ -44,14 +44,14 @@ log_cron = 0 * * * * ? * sessiontimeout_feed_cron = 0 0/5 * * * ? * #Front end URL -frontend_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/applicationsHome +frontend_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/applicationsHome #cookie domain cookie_domain = openecomp.org # An Unqiue 128-bit value defined to indentify a specific version of # ECOMP Portal deployed on a specific virtual machine. -# This value must be generated and updated at the time of +# This value must be generated and updated at the time of # the deployment. # Online Unique UUID generator - https://www.uuidgenerator.net/ instance_uuid = 90bc9497-10e6-49fe-916b-dcdfaa972383 @@ -95,3 +95,6 @@ external_access_enable = false #delete auditlog from number of days ago auditlog_del_day_from = 365 + +#External system notification URL +external_system_notification_url= https://jira.onap.org/browse/ diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties index 8ce8cc95ad..8ee0a95f74 100644 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties @@ -8,7 +8,7 @@ login_method_csp = csp login_method_web_junction = web_junction #login message -login.error.hrid.empty = Login failed, please contact system administrator. +login.error.hrid.empty = Login failed, please contact system administrator. login.error.hrid.not-found = User not found, please contact system administrator. login.error.user.inactive = Account is disabled, please contact system administrator. diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties index 1e51bdf361..b68ab07f7f 100755 --- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties +++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties @@ -16,7 +16,8 @@ use_rest_for_functional_menu=true ########################################################################## # Name of java class that implements the OnBoardingApiService interface. -portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl +# epsdk 1.3 uses org.onap prefix +portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl # CSP Global Log On for single sign on ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm @@ -25,7 +26,7 @@ ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi -# Applications do not need to run a UEB listener in 1610. +# Applications do not need to run a UEB listener in 1610. ueb_listeners_enable = false # UEB Configuration 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 964c7c479e..d638abcca3 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 @@ -23,11 +23,10 @@ decryption_key = AGLDdG4D04BKm2IxIWEr8o== # The following properties MAY require changes by partner applications. ########################################################################## -#Mysql -db.driver = com.mysql.jdbc.Driver -db.connectionURL = jdbc:mysql://portaldb.onap-portal:3306/ecomp_sdk +db.driver = org.mariadb.jdbc.Driver +db.connectionURL = jdbc:mariadb://portaldb.onap-portal:3306/ecomp_sdk db.userName = root -db.password = password +db.password = Aa123456 db.min_pool_size = 5 db.max_pool_size = 10 hb.dialect = org.hibernate.dialect.MySQLDialect @@ -53,7 +52,7 @@ contact_us_link = https://todo_contact_us_link.com # An Unique 128-bit value defined to identify a specific version # of an application deployed on a specific virtual machine. -# This value must be generated and updated by the application +# This value must be generated and updated by the application # which is using the ECOMP SDK at the time of its deployment. # Online Unique UUID generator - https://www.uuidgenerator.net/ instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d 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 6e9f6c013f..baf571eb45 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 @@ -8,7 +8,7 @@ microservice.widget.location=/tmp ## App DB Properties spring.datasource.url=jdbc:mysql://portaldb.onap-portal:3306/portal spring.datasource.username=root -spring.datasource.password=password +spring.datasource.password=Aa123456 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect spring.database.driver.classname=org.mariadb.jdbc.Driver spring.jpa.show-sql=false diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py index d0ef25623c..5601bdd560 100755 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py +++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py @@ -11,7 +11,7 @@ GLOBAL_INJECTED_DOCKER_VERSION = "1.1-STAGING-latest" GLOBAL_INJECTED_GERRIT_BRANCH = "master" GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE" GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router" -GLOBAL_INJECTED_MSO_IP_ADDR = "mso.onap-mso" +GLOBAL_INJECTED_SO_IP_ADDR = "mso.onap-mso" GLOBAL_INJECTED_NETWORK = "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE" GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "nexus3.onap.org:10001" GLOBAL_INJECTED_NEXUS_PASSWORD = "docker" diff --git a/kubernetes/dcaegen2/dcae-parameters-sample.yaml b/kubernetes/dcaegen2/dcae-parameters-sample.yaml index b2cffae46b..1d6c63d8bb 100644 --- a/kubernetes/dcaegen2/dcae-parameters-sample.yaml +++ b/kubernetes/dcaegen2/dcae-parameters-sample.yaml @@ -1,41 +1,41 @@ # UUID of the OpenStack"s CentOS 7 cloud VM image # If your Openstack does not have a CentOS 7 cloud image, you will have to add one. -centos7image_id: "52d4ea09-cc69-4a9a-9961-938a3282d209" +centos7image_id: '52d4ea09-cc69-4a9a-9961-938a3282d209' # UUID of the OpenStack"s Ubuntu 16.04 VM image # If your Openstack does not have a buntu 16.04 cloud image, you will have to add one. -ubuntu1604image_id: "97bbe637-5d42-419a-a2c7-beff33ffa23c" +ubuntu1604image_id: '97bbe637-5d42-419a-a2c7-beff33ffa23c' # ID of the OpenStack"s VM flavor to be used by DCAEGEN2 VMs (m1.medium/m1.large) -flavor_id: "4" +flavor_id: '4' # UUID of the OpenStack"s security group to be used for DCAEGEN2 VMs -security_group: "abc0687d-34ab-4d37-8fe8-4b544d94ba71" +security_group: 'abc0687d-34ab-4d37-8fe8-4b544d94ba71' # The name of the OpenStack network where public IP addresses and floating IPs are allocated from # This must use the name and not the UUID. The name must be unique otherwise the installer fails -public_net: "public" +public_net: 'public' # The name of the OpenStack network where private IP addresses are allocated from -private_net: "onap_oam" +private_net: 'onap_oam' # Group header for OpenStack Keystone parameters openstack: # User name - username: "dev" + username: 'dev' # Password - password: "dev" + password: 'dev' # Name of the OpenStack tenant/project where DCAEGEN2 VMs are deployed - tenant_name: "dev" - # Openstack authentication API URL, for example "https://horizon.playground.onap.org:5000/v2.0" - auth_url: "http://1.2.3.4:5000/v2.0" - # Name of the OpenStack region where DCAEGEN2 VMs are deployed, for example "RegionOne" - region: "RegionOne" + tenant_name: 'dev' + # Openstack authentication API URL, for example 'https://horizon.playground.onap.org:5000/v2.0' + auth_url: 'http://1.2.3.4:5000/v2.0' + # Name of the OpenStack region where DCAEGEN2 VMs are deployed, for example 'RegionOne' + region: 'RegionOne' # Name of the public key uploaded to OpenStack in the Prepration step -keypair: "dcae-g2" +keypair: 'dcae-g2' # Path to the private key within the conatiner (!! Do not change!!) -key_filename: "/opt/dcae/key" +key_filename: '/opt/dcae/key' # Prefix (location code) of all DCAEGEN2 VMs -location_prefix: "onapr1" -# Domain name of the OpenStack tenant "onapr1.playground.onap.org" -location_domain: "onap-dcaegen2" -# Location of the raw artifact repo hosting additional boot scripts called by DCAEGEN2 VMs" cloud-init, for example: "https://nexus.onap.org/service/local/repositories/raw/content" -codesource_url: "https://nexus.onap.org/content/sites/raw" -# Path to the boot scripts within the raw artifact repo, for example: "org.onap.dcaegen2.deployments.scripts/releases/" -codesource_version: "org.onap.dcaegen2.deployments/releases/scripts/" +location_prefix: 'onapr1' +# Domain name of the OpenStack tenant 'onapr1.playground.onap.org' +location_domain: 'onap-dcaegen2' +# Location of the raw artifact repo hosting additional boot scripts called by DCAEGEN2 VMs" cloud-init, for example: 'https://nexus.onap.org/service/local/repositories/raw/content' +codesource_url: 'https://nexus.onap.org/content/sites/raw' +# Path to the boot scripts within the raw artifact repo, for example: 'org.onap.dcaegen2.deployments.scripts/releases/' +codesource_version: 'org.onap.dcaegen2.deployments/releases/scripts/' diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml index a63dace7de..8c1533887e 100644 --- a/kubernetes/msb/values.yaml +++ b/kubernetes/msb/values.yaml @@ -1,9 +1,9 @@ nsPrefix: onap pullPolicy: IfNotPresent image: - consul: consul:latest - discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:latest - apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:latest + consul: consul:0.9.3 + discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:1.0.0-STAGING-latest + apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:1.0.0-STAGING-latest consulPort: 8500 consulNodePort: 30500 diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash index c23f01456a..72d852ded6 100755 --- a/kubernetes/oneclick/createAll.bash +++ b/kubernetes/oneclick/createAll.bash @@ -13,7 +13,7 @@ Usage: $0 [PARAMs] -i [INSTANCE] : ONAP deployment instance # (default: 1) -a [APP] : Specify a specific ONAP component (default: all) from the following choices: - sdc, aai ,mso, message-router, robot, vid, aaf + sdc, aai ,mso, message-router, robot, vid, aaf, uui sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk EOF } diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash index cdc651b1a9..cf293e48ad 100755 --- a/kubernetes/oneclick/deleteAll.bash +++ b/kubernetes/oneclick/deleteAll.bash @@ -45,7 +45,7 @@ Usage: $0 [PARAMs] -n [NAMESPACE] : Kubernetes namespace (required) -a [APP] : Specify a specific ONAP component (default: all) from the following choices: - sdc, aai ,mso, message-router, robot, vid, aaf + sdc, aai ,mso, message-router, robot, vid, aaf, uui sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk -N : Do not wait for deletion of namespace and its objects EOF diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash index 785ebb6248..add69f39a1 100644 --- a/kubernetes/oneclick/setenv.bash +++ b/kubernetes/oneclick/setenv.bash @@ -1,7 +1,7 @@ #!/bin/bash # Deploying MSB first and kube2msb last will ensure all the ONAP services can be registered to MSB -HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'vnfsdk' 'kube2msb' 'aaf' 'vfc') +HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'vnfsdk' 'uui' 'aaf' 'vfc' 'kube2msb') ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001} ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker} ONAP_DOCKER_PASS=${ONAP_DOCKER_PASS:-docker} diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml index 13cf57093d..c9cb645bae 100755 --- a/kubernetes/portal/templates/portal-apps-deployment.yaml +++ b/kubernetes/portal/templates/portal-apps-deployment.yaml @@ -38,7 +38,7 @@ spec: "name": "portalapps-readiness" }, { - "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -ppassword -h portaldb < /portal-mysql/oom_updates.sql; fi"], + "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -pAa123456 -h portaldb < /portal-mysql/oom_updates.sql; fi"], "volumeMounts": [ { "mountPath": "/portal-mysql/oom_updates.sql", @@ -77,14 +77,6 @@ spec: name: portal-portal-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: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/conf/system.properties" - name: dbcapp-system-properties - - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/classes/portal.properties" - name: dbcapp-portal-properties - - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties" - name: dbcapp-dbcapp-properties - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/conf/system.properties" name: sdkapp-system-properties - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/classes/portal.properties" diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml index df38a2abb3..8dc7ebabf3 100755 --- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml +++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml @@ -14,14 +14,14 @@ spec: name: portaldb spec: containers: - - image: {{ .Values.image.portaldb}} + - image: {{ .Values.image.portaldb}} imagePullPolicy: {{ .Values.pullPolicy }} name: "portaldb" env: - name: MYSQL_HOST value: "portaldb.{{ .Values.nsPrefix }}-portal" - name: MYSQL_ROOT_PASSWORD - value: password + value: Aa123456 volumeMounts: - mountPath: /etc/localtime name: localtime diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml index 757995ab63..eadc834599 100644 --- a/kubernetes/portal/values.yaml +++ b/kubernetes/portal/values.yaml @@ -3,10 +3,10 @@ pullPolicy: Always nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 - portalapps: nexus3.onap.org:10001/openecomp/portal-apps:1.1-STAGING-latest - portaldb: nexus3.onap.org:10001/openecomp/portal-db:1.1-STAGING-latest + portalapps: nexus3.onap.org:10001/openecomp/portal-apps:1.3-STAGING-latest + portaldb: nexus3.onap.org:10001/openecomp/portal-db:1.3-STAGING-latest mariadbClient: oomk8s/mariadb-client-init:1.0.0 - portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.1-STAGING-latest + portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.3-STAGING-latest ubuntuInit: oomk8s/ubuntu-init:1.0.0 ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc filebeat: docker.elastic.co/beats/filebeat:5.5.0 diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml new file mode 100644 index 0000000000..1813f6e636 --- /dev/null +++ b/kubernetes/uui/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: uui +version: 1.1.0 diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml new file mode 100644 index 0000000000..e768fe26ac --- /dev/null +++ b/kubernetes/uui/templates/all-services.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: uui + name: uui + namespace: "{{ .Values.nsPrefix }}-uui" +spec: + ports: + - name: uui + nodePort: {{ .Values.uuiPortPrefix }}98 + port: 8080 + selector: + app: uui + type: NodePort diff --git a/kubernetes/uui/templates/uui-deployment.yaml b/kubernetes/uui/templates/uui-deployment.yaml new file mode 100644 index 0000000000..e23202a907 --- /dev/null +++ b/kubernetes/uui/templates/uui-deployment.yaml @@ -0,0 +1,34 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: uui + name: uui + namespace: "{{ .Values.nsPrefix }}-uui" +spec: + selector: + matchLabels: + app: uui + template: + metadata: + labels: + app: uui + name: uui + spec: + containers: + - image: {{ .Values.image.uuiImage }}:{{ .Values.image.uuiVersion }} + imagePullPolicy: {{ .Values.pullPolicy }} + command: + - /bin/bash + - -c + - /home/uui/tomcat/bin/catalina.sh run + name: uui + ports: + - containerPort: 8080 + readinessProbe: + tcpSocket: + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 10 + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml new file mode 100644 index 0000000000..c233c76115 --- /dev/null +++ b/kubernetes/uui/values.yaml @@ -0,0 +1,6 @@ +nsPrefix: onap +pullPolicy: Always +uuiPortPrefix: 302 +image: + uuiImage: nexus3.onap.org:10001/onap/usecase-ui + uuiVersion: latest diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml index b1e8b1fe8a..a54dc00b2c 100755 --- a/kubernetes/vfc/templates/all-services.yaml +++ b/kubernetes/vfc/templates/all-services.yaml @@ -350,7 +350,7 @@ metadata: "port": "{{.Values.catalog.port}}", "visualRange":"1" } - ] + ]' spec: ports: - name: vfc-catalog