diff options
Diffstat (limited to 'deliveries')
| -rw-r--r-- | deliveries/.env | 2 | ||||
| -rw-r--r-- | deliveries/Apps_Users_OnBoarding_Script.sql | 2 | ||||
| -rwxr-xr-x | deliveries/os_docker_release.sh | 4 | ||||
| -rw-r--r-- | deliveries/portal.cql | 2 | ||||
| -rw-r--r-- | deliveries/portalsdk.cql | 2 | ||||
| -rw-r--r-- | deliveries/properties_simpledemo/ONAPPORTAL/music.properties | 23 | ||||
| -rw-r--r-- | deliveries/properties_simpledemo/ONAPPORTAL/system.properties | 2 | ||||
| -rw-r--r-- | deliveries/properties_simpledemo/ONAPPORTALSDK/music.properties | 23 | ||||
| -rw-r--r-- | deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties | 2 |
9 files changed, 43 insertions, 19 deletions
diff --git a/deliveries/.env b/deliveries/.env index d701b02f..73259592 100644 --- a/deliveries/.env +++ b/deliveries/.env @@ -14,7 +14,7 @@ CLI_IMG_NAME=onap/cli # This is the first portion of the Docker image tag # that is published to the ONAP registry. -PORTAL_VERSION=v2.2.0 +PORTAL_VERSION=v2.3.0 # This is used during builds and in docker-compose; # it is never published to the ONAP registry. diff --git a/deliveries/Apps_Users_OnBoarding_Script.sql b/deliveries/Apps_Users_OnBoarding_Script.sql index 0232a1f4..34dbe896 100644 --- a/deliveries/Apps_Users_OnBoarding_Script.sql +++ b/deliveries/Apps_Users_OnBoarding_Script.sql @@ -12,7 +12,7 @@ INSERT INTO `fn_app` (`app_id`, `app_name`, `app_image_url`, `app_description`, (5, 'Policy', 'images/cache/portal1470452815_67021.png', NULL, NULL, 'http://policy.api.simpledemo.onap.org:8443/onap/policy', NULL, 'http://policy.api.simpledemo.onap.org:8443/onap/api/v2', '', '', NULL, 'okYTaDrhzibcbGVq5mjkVQ==', 'N', 'Y', NULL, 'Default', 'ueb_key', 'ueb_secret', 'ECOMP-PORTAL-OUTBOX', 1,'N',NULL), (6, 'Virtual Infrastructure Deployment', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://vid.api.simpledemo.onap.org:8080/vid/welcome.htm', NULL, 'http://vid.api.simpledemo.onap.org:8080/vid/api/v2', '', '', NULL, 'okYTaDrhzibcbGVq5mjkVQ==', 'N', 'Y', NULL, 'Default', '2Re7Pvdkgw5aeAUD', 'S31PrbOzGgL4hg4owgtx47Da', 'ECOMP-PORTAL-OUTBOX-90', 1,'N',NULL), (7, 'A&AI UI', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://aai.api.simpledemo.onap.org:9517/services/aai/webapp/index.html#/viewInspect', NULL, 'http://aai.api.simpledemo.onap.org:9517/api/v2', '', '', NULL, 't1oqm6wCXrGUXUSL8mS7pQ==', 'N', 'Y', NULL, 'aaiui', 'ueb_key', 'ueb_secret', 'ECOMP-PORTAL-OUTBOX', 1,'N',NULL), -(8, 'CLI', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://portal.api.simpledemo.onap.org:8080/', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 1,'N',NULL), +(8, 'CLI', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://portal.api.simpledemo.onap.org:8080/', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 2,'N',NULL), (9, 'MSB', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://msb-discovery:8080/iui/microservices/default.html', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 2,'N',NULL); -- insert SDC users user id2-8 diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh index 3ff88b2d..2a22fef8 100755 --- a/deliveries/os_docker_release.sh +++ b/deliveries/os_docker_release.sh @@ -13,7 +13,7 @@ if [ -z "$PORTAL_VERSION" ]; then fi TIMESTAMP=$(date +%C%y%m%dT%H%M%S) -export VERSION="${PORTAL_VERSION}-${TIMESTAMP}" -export LATEST="${PORTAL_VERSION}" +export VERSION="${PORTAL_VERSION}-STAGING-${TIMESTAMP}" +export LATEST="${PORTAL_VERSION}-STAGING-latest" exec ./os_docker_base.sh diff --git a/deliveries/portal.cql b/deliveries/portal.cql index 6cb62713..b871ab9f 100644 --- a/deliveries/portal.cql +++ b/deliveries/portal.cql @@ -52,3 +52,5 @@ CREATE TABLE portal.spring_session_attributes ( AND min_index_interval = 128 AND read_repair_chance = 0.0 AND speculative_retry = '99PERCENTILE'; + +CREATE TABLE portal.healthcheck (id uuid PRIMARY KEY);
\ No newline at end of file diff --git a/deliveries/portalsdk.cql b/deliveries/portalsdk.cql index 62da5dd7..bf4e71a3 100644 --- a/deliveries/portalsdk.cql +++ b/deliveries/portalsdk.cql @@ -52,3 +52,5 @@ CREATE TABLE portalsdk.spring_session_attributes ( AND min_index_interval = 128 AND read_repair_chance = 0.0 AND speculative_retry = '99PERCENTILE'; + +CREATE TABLE portalsdk.healthcheck (id uuid PRIMARY KEY); diff --git a/deliveries/properties_simpledemo/ONAPPORTAL/music.properties b/deliveries/properties_simpledemo/ONAPPORTAL/music.properties index 89090448..b33ca269 100644 --- a/deliveries/properties_simpledemo/ONAPPORTAL/music.properties +++ b/deliveries/properties_simpledemo/ONAPPORTAL/music.properties @@ -1,12 +1,14 @@ -music.version = v2 -music.keyspace = keyspaces +# For API calls +#music.version = v2 +#music.keyspace = keyspaces +#music.tables = tables +#music.consistency.info = type +#music.consistency.info.value = eventual +music.cache = false + music.session.keyspace = portal -music.tables = tables music.session.attr.tables = spring_session_attributes music.session.meta.tables = spring_session -music.consistency.info = type -music.consistency.info.value = eventual -music.cache = false music.session.max.inactive.interval.seconds = 1800 music.serialize.compress = true @@ -17,4 +19,11 @@ music.atomic.put = true cassandra.host=portal-cassandra zookeeper.host=portal-zk cassandra.user=root -cassandra.password=Aa123456
\ No newline at end of file +cassandra.password=Aa123456 + +music.exclude.api = /portalApi/healthCheck,/portalApi/healthCheckSuspend,/portalApi/healthCheckResume + +#how often the session clean up would happen (hour) +music.cleanup.frequency = 6 +#how old of session need to be cleaned up (hour) +music.cleanup.threshold = 10
\ No newline at end of file diff --git a/deliveries/properties_simpledemo/ONAPPORTAL/system.properties b/deliveries/properties_simpledemo/ONAPPORTAL/system.properties index c16c4905..928605c1 100644 --- a/deliveries/properties_simpledemo/ONAPPORTAL/system.properties +++ b/deliveries/properties_simpledemo/ONAPPORTAL/system.properties @@ -90,6 +90,8 @@ microservices.widget.local.port = 8082 microservices.m-learn.local.port = 8083 #HALO API enable flag external_access_enable = false +#Widgets upload flag +microservices.widget.upload.flag=true #delete auditlog from number of days ago auditlog_del_day_from = 365 diff --git a/deliveries/properties_simpledemo/ONAPPORTALSDK/music.properties b/deliveries/properties_simpledemo/ONAPPORTALSDK/music.properties index d78e30e6..a28efe6d 100644 --- a/deliveries/properties_simpledemo/ONAPPORTALSDK/music.properties +++ b/deliveries/properties_simpledemo/ONAPPORTALSDK/music.properties @@ -1,12 +1,14 @@ -music.version = v2 -music.keyspace = keyspaces +# For API calls +#music.version = v2 +#music.keyspace = keyspaces +#music.tables = tables +#music.consistency.info = type +#music.consistency.info.value = eventual +music.cache = false + music.session.keyspace = portalsdk -music.tables = tables music.session.attr.tables = spring_session_attributes music.session.meta.tables = spring_session -music.consistency.info = type -music.consistency.info.value = eventual -music.cache = false music.session.max.inactive.interval.seconds = 1800 music.serialize.compress = true @@ -17,4 +19,11 @@ music.atomic.put = true cassandra.host=portal-cassandra zookeeper.host=portal-zk cassandra.user=root -cassandra.password=Aa123456
\ No newline at end of file +cassandra.password=Aa123456 + +music.exclude.api = /portalApi/healthCheck,/portalApi/healthCheckSuspend,/portalApi/healthCheckResume + +#how often the session clean up would happen (hour) +music.cleanup.frequency = 6 +#how old of session need to be cleaned up (hour) +music.cleanup.threshold = 10
\ No newline at end of file diff --git a/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties b/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties index e353ace5..547a882c 100644 --- a/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties +++ b/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties @@ -19,7 +19,7 @@ security.user.name=widget_user security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718) initialization.default.widgets=true -initialization.widgetData.url=http://portal-app:8080/ONAPPORTAL/commonWidgets +initialization.widgetData.url=http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/commonWidgets ## Account Basic Authentication Properties account.user.name=portal |