Increase DB timeout; rename props dir

1. Revise docker compose:
a) Use version 2.1, up from 2.0
b) Increase apps database startup timeout from 3 to 5 minutes
2. Rename the properties directory to drop the env-specific name "rackspace"
3. Use MariaDB JDBC connection URL for DBC app.
4. Show AAI-UI and CLI apps by default on application home screen

Issue: PORTAL-20, PORTAL-95, PORTAL-117
Change-Id: I3a96d2e3142a7c2229f5b67525d79fa5e602084b
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

13 files changed, 0 insertions, 786 deletions

diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/dbcapp.properties b/deliveries/properties_rackspace/ECOMPDBCAPP/dbcapp.properties
deleted file mode 100644
index 1c13384d..00000000
--- a/deliveries/properties_rackspace/ECOMPDBCAPP/dbcapp.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Properties for the Data Bus Controller webapp
-dmaap.rest.url.list = http://10.0.4.102: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/deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties b/deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties
deleted file mode 100644
index 4d4e17e9..00000000
--- a/deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties
+++ /dev/null
@@ -1,33 +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 Session settings
-user_attribute_name      = user
-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/deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties b/deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties
deleted file mode 100644
index cec3bb3c..00000000
--- a/deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Properties read by ECOMP Framework library, ecompFW.jar
-
-# epsdk 1.1 has org.openecomp package prefix
-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/deliveries/properties_rackspace/ECOMPDBCAPP/system.properties b/deliveries/properties_rackspace/ECOMPDBCAPP/system.properties
deleted file mode 100644
index 019268b7..00000000
--- a/deliveries/properties_rackspace/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://portal-db:3306/dbca_os
-db.userName = root
-db.password = Aa123456
-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/deliveries/properties_rackspace/ECOMPPORTALAPP/fusion.properties b/deliveries/properties_rackspace/ECOMPPORTALAPP/fusion.properties
deleted file mode 100644
index c92a5739..00000000
--- a/deliveries/properties_rackspace/ECOMPPORTALAPP/fusion.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# domain settings
-#domain_class_location = 
-
-# validator settings
-#default_error_message = Default error message
-
-login_url_no_ret_val = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm
-
-user_attribute_name      = user
-
-# User Session settings
-roles_attribute_name          = roles
-role_functions_attribute_name = role_functions
-
-# 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
-
-# ECOMP settings
-ecomp_app_id = 1
-# Role settings
-sys_admin_role_id = 1
-account_admin_role_id = 999
-restricted_app_role_id = 900
-
-# Home Page index html
-home_page          					= /index.html
-
-authentication_mechanism =DBAUTH
-
-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.
-
-#
-# Number of seconds to poll health (database operational, etc.)
-#
-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 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/deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml b/deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml
deleted file mode 100644
index 8afa5af9..00000000
--- a/deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START==========================================
-  ONAP Portal
-  ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  ===================================================================
- 
-  Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
-  you may not use this software except in compliance with the License.
-  You may obtain a copy of the License at
- 
-              http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- 
-  Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
-  you may not use this documentation except in compliance with the License.
-  You may obtain a copy of the License at
- 
-              https://creativecommons.org/licenses/by/4.0/
- 
-  Unless required by applicable law or agreed to in writing, documentation
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- 
-  ============LICENSE_END============================================
- 
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-  -->
-
-<!DOCTYPE xml>
-<configuration scan="true" scanPeriod="3 seconds" debug="true">
-	<!-- Log-back files for the ECOMP Portal "ecompportal" are created in directory 
-		${catalina.base}/logs/ecompportal; e.g., apache-tomcat-8.0.35/logs/ecompportal/application.log -->
-	<!--<jmxConfigurator /> -->
-
-	<!-- specify the component name -->
-	<property name="componentName" value="ecompportal"></property>
-
-	<!-- specify the base path of the log directory -->
-	<property name="logDirPrefix" value="${catalina.base}/logs"></property>
-
-	<!-- The directories where logs are written -->
-	<property name="logDirectory" value="${logDirPrefix}/${componentName}" />
-	<!-- Can easily relocate debug logs by modifying this path. -->
-	<property name="debugLogDirectory" value="${logDirPrefix}/${componentName}" />
-
-	<!-- log file names -->
-	<property name="generalLogName" value="application" />
-	<property name="errorLogName" value="error" />
-	<property name="metricsLogName" value="metrics" />
-	<property name="auditLogName" value="audit" />
-	<property name="debugLogName" value="debug" />
-	<!-- These loggers are not used in code (yet). <property name="securityLogName" 
-		value="security" /> <property name="policyLogName" value="policy" /> <property 
-		name="performanceLogName" value="performance" /> <property name="serverLogName" 
-		value="server" /> -->
-
-	<!-- ServerFQDN=Server,  -->
-	<property name="auditLoggerPattern"
-		value="%X{AuditLogBeginTimestamp}|%X{AuditLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
-	
-	<property name="metricsLoggerPattern"
-		value="%X{MetricsLogBeginTimestamp}|%X{MetricsLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVisualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
-	
-	<property name="errorLoggerPattern"
-		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ClassName}|%X{AlertSeverity}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />
-	
-	<property name="defaultLoggerPattern"
-		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ClassName}| %msg%n" />
-	
-	<!-- use %class so library logging calls yield their class name -->
-  	<property name="applicationLoggerPattern"
-		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%class{36}| %msg%n" />
-	
-	<!-- 	
-	<property name="defaultPattern"
-		value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
-	<property name="debugLoggerPattern"
-		value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
-	 -->
-	<!-- <property name="debugLoggerPattern" value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n" 
-		/> -->
-	<!-- Example evaluator filter applied against console appender -->
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${applicationLoggerPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<!-- ============================================================================ -->
-	<!-- EELF Appenders -->
-	<!-- ============================================================================ -->
-
-	<!-- The EELFAppender is used to record events to the general application 
-		log -->
-
-
-	<appender name="EELF"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${generalLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily rollover -->
-			<fileNamePattern>${logDirectory}/${generalLogName}.log.%d{yyyy-MM-dd}.zip
-			</fileNamePattern>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${applicationLoggerPattern}</pattern>
-		</encoder>
-		<filter class="org.openecomp.portalapp.portal.utils.CustomLoggingFilter" />
-	</appender>
-
-	<appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<!-- Class name is part of caller data -->
-    	<includeCallerData>true</includeCallerData>
-		<appender-ref ref="EELF" />
-	</appender>
-
-	<!-- EELF Security Appender. This appender is used to record security events 
-		to the security log file. Security events are separate from other loggers 
-		in EELF so that security log records can be captured and managed in a secure 
-		way separate from the other logs. This appender is set to never discard any 
-		events. -->
-	<!-- <appender name="EELFSecurity" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-		<file>${logDirectory}/${securityLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-		<fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip </fileNamePattern> 
-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> 
-		</appender> <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender"> 
-		<queueSize>256</queueSize> <discardingThreshold>0</discardingThreshold> <appender-ref 
-		ref="EELFSecurity" /> </appender> -->
-
-	<!-- EELF Performance Appender. This appender is used to record performance 
-		records. -->
-	<!-- <appender name="EELFPerformance" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-		<file>${logDirectory}/${performanceLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-		<fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip </fileNamePattern> 
-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-		</triggeringPolicy> <encoder> <outputPatternAsHeader>true</outputPatternAsHeader> 
-		<pattern>${defaultPattern}</pattern> </encoder> </appender> <appender name="asyncEELFPerformance" 
-		class="ch.qos.logback.classic.AsyncAppender"> <queueSize>256</queueSize> 
-		<appender-ref ref="EELFPerformance" /> </appender> -->
-
-	<!-- EELF Server Appender. This appender is used to record Server related 
-		logging events. The Server logger and appender are specializations of the 
-		EELF application root logger and appender. This can be used to segregate 
-		Server events from other components, or it can be eliminated to record these 
-		events as part of the application root log. -->
-	<!-- <appender name="EELFServer" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-		<file>${logDirectory}/${serverLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-		<fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip </fileNamePattern> 
-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> 
-		</appender> <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender"> 
-		<queueSize>256</queueSize> <appender-ref ref="EELFServer" /> </appender> -->
-
-	<!-- EELF Policy Appender. This appender is used to record Policy engine 
-		related logging events. The Policy logger and appender are specializations 
-		of the EELF application root logger and appender. This can be used to segregate 
-		Policy engine events from other components, or it can be eliminated to record 
-		these events as part of the application root log. -->
-	<!-- <appender name="EELFPolicy" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-		<file>${logDirectory}/${policyLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-		<fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip </fileNamePattern> 
-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> 
-		</appender> <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender"> 
-		<queueSize>256</queueSize> <appender-ref ref="EELFPolicy" /> </appender> -->
-
-	<!-- EELF Audit Appender. This appender is used to record audit engine related 
-		logging events. The audit logger and appender are specializations of the 
-		EELF application root logger and appender. This can be used to segregate 
-		Policy engine events from other components, or it can be eliminated to record 
-		these events as part of the application root log. -->
-
-	<appender name="EELFAudit"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${auditLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily roll over -->
-			<fileNamePattern>${logDirectory}/${auditLogName}.log.%d{yyyy-MM-dd}.zip
-			</fileNamePattern>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${auditLoggerPattern}</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFAudit" />
-	</appender>
-
-	<appender name="EELFMetrics"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${metricsLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily roll over -->
-			<fileNamePattern>${logDirectory}/${metricsLogName}.log.%d{yyyy-MM-dd}.zip
-			</fileNamePattern>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${metricsLoggerPattern}</pattern>
-		</encoder>
-	</appender>
-
-
-	<appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFMetrics" />
-	</appender>
-
-	<appender name="EELFError"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${errorLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily roll over -->
-			<fileNamePattern>${logDirectory}/${errorLogName}.log.%d{yyyy-MM-dd}.zip
-			</fileNamePattern>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${errorLoggerPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFError" />
-	</appender>
-
-	<appender name="EELFDebug"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${debugLogDirectory}/${debugLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily roll over -->
-			<fileNamePattern>${logDirectory}/${debugLogName}.log.%d{yyyy-MM-dd}.zip
-			</fileNamePattern>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${defaultLoggerPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFDebug" />
-		<includeCallerData>true</includeCallerData>
-	</appender>
-
-
-	<!-- ============================================================================ -->
-	<!-- EELF loggers -->
-	<!-- ============================================================================ -->
-	<logger name="com.att.eelf" level="info" additivity="false">
-		<appender-ref ref="asyncEELF" />
-	</logger>
-
-	<!-- <logger name="com.att.eelf.security" level="info" additivity="false"> 
-		<appender-ref ref="asyncEELFSecurity" /> </logger> <logger name="com.att.eelf.perf" 
-		level="info" additivity="false"> <appender-ref ref="asyncEELFPerformance" 
-		/> </logger> <logger name="com.att.eelf.server" level="info" additivity="false"> 
-		<appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy" 
-		level="info" additivity="false"> <appender-ref ref="asyncEELFPolicy" /> </logger> -->
-
-	<logger name="com.att.eelf.audit" level="info" additivity="false">
-		<appender-ref ref="asyncEELFAudit" />
-	</logger>
-
-	<logger name="com.att.eelf.metrics" level="info" additivity="false">
-		<appender-ref ref="asyncEELFMetrics" />
-	</logger>
-
-	<logger name="com.att.eelf.error" level="info" additivity="false">
-		<appender-ref ref="asyncEELFError" />
-	</logger>
-
-	<logger name="com.att.eelf.debug" level="debug" additivity="false">
-		<appender-ref ref="asyncEELFDebug" />
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="asyncEELF" />
-	</root>
-
-</configuration>
diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties b/deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties
deleted file mode 100644
index 33c919b2..00000000
--- a/deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-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/deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties b/deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties
deleted file mode 100644
index 2ec8bb48..00000000
--- a/deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
-
-# 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
-
-ueb_listeners_enable = true
-
-ueb_app_key = 7GkVcrO6sIDb3ngW 
-ueb_app_secret = uCYgKjWKK5IxPGNNZzYSSWo9
-ueb_app_mailbox_name = ECOMP-PORTAL-INBOX
-
-ueb_url_list = ueb.api.simpledemo.openecomp.org
-ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX
-
-# Consumer group name for UEB topic.
-# Use the special tag to generate a unique one for each sdk-app server.
-ueb_app_consumer_group_name = {UUID}
diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties b/deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties
deleted file mode 100644
index 5306c2ab..00000000
--- a/deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties
+++ /dev/null
@@ -1,100 +0,0 @@
-#mysql
-db.driver = org.mariadb.jdbc.Driver
-db.connectionURL = jdbc:mariadb:failover://portal-db:3306/portal
-db.userName =root
-db.password =Aa123456
-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
-
-app_display_name = Portal
-files_path = /tmp
-context_root = ECOMPPORTAL
-# menu settings
-menu_query_name                      = menuData
-menu_properties_file_location        = /WEB-INF/fusion/menu/
-application_menu_set_name            = APP
-application_menu_attribute_name      = applicationMenuData
-application_menu_properties_name     = menu.properties
-business_direct_menu_set_name        = BD
-business_direct_menu_properties_name = bd.menu.properties
-business_direct_menu_attribute_name  = businessDirectMenuData
-
-application_user_id           = 30000
-post_default_role_id          = 1
-
-#Enable Fusion Mobile capabilities for the application
-mobile_enable			  	  = false
-
-cache_config_file_path        = /WEB-INF/conf/cache.ccf
-cache_switch                  = 1
-cache_load_on_startup         = false
-
-user_name					  = fullName
-decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
-
-
-#Cron Schedules
-cron_site_name                = one
-log_cron                      = 0 * * * * ? *
-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
-
-# 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 
-# the deployment.
-# Online Unique UUID generator - https://www.uuidgenerator.net/
-instance_uuid 				= 90bc9497-10e6-49fe-916b-dcdfaa972383
-
-elastic_search_url 			= http://
-contact_us_link				= http://
-user_guide_link             = http://
-
-# Contact Us page properties
-ush_ticket_url				= http://
-feedback_email_address		= portal@lists.openecomp.org
-portal_info_url				= https://
-
-#Online user bar refresh interval, in seconds
-online_user_update_rate                  = 30
-
-#Online user bar refresh total duration, in seconds
-online_user_update_duration       = 300
-
-#authenticate user server
-authenticate_user_server=http://portal.api.simpledemo.openecomp.org:8383/openid-connect-server-webapp/allUsers
-
-#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-wms
-microservices.widget.username = widget_user
-microservices.widget.password = KpuqIB08YHg+btG+pjX+sA==
-#This property won't be needed after consul is functional on VMs -
-microservices.widget.local.port = 8082
-microservices.m-learn.local.port = 8083
-#HALO API enable flag
-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/deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties b/deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties
deleted file mode 100644
index 8ce8cc95..00000000
--- a/deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-# login settings
-login_method_backdoor       = backdoor
-login_method_attribute_name = login_method
-
-# These properties will be removed after SingleSignOnController is cleaned
-authentication_mechanism = BOTH
-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.
-
-# User Session settings
-user_attribute_name           = user
-roles_attribute_name          = roles
-role_function_list = role_function_list
-role_functions_attribute_name = role_functions
-
-# Import-user LDAP settings
-post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory
-post_provider_url            = ldap://ldap.mycompany.com:389
-post_security_principal      = ou=people,o=mycompany,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/deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties b/deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties
deleted file mode 100644
index 31809ddc..00000000
--- a/deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-# Properties read by ECOMP Framework library, ecompFW.jar
-
-##########################################################################
-# The following properties should NOT be changed by partner applications.
-##########################################################################
-
-portal.api.prefix = /api
-max.idle.time = 5
-user.attribute.name = user_attribute
-
-#Use REST API instead of UEB to fetch the functional menu data
-use_rest_for_functional_menu=true
-
-##########################################################################
-# The following properties MUST be changed by partner applications.
-##########################################################################
-
-# Name of java class that implements the OnBoardingApiService interface.
-# 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
-
-# URL of the ECOMP Portal REST API
-
-ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi
-
-# Applications do not need to run a UEB listener in 1610.  
-ueb_listeners_enable = false
-
-# UEB Configuration
-ueb_url_list = ueb.api.simpledemo.openecomp.org
-# 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,
-# as shown on the on-boarding page on the ECOMP Portal web application.
-ueb_app_key = jQd4a9zVNi4ePyBp
-ueb_app_secret = P0HpqEBhKJvxjRYdw2sCTUll
-ueb_app_mailbox_name = ECOMP-PORTAL-OUTBOX-APP1
-# Consumer group name for UEB topic.
-# Use the special tag '{UUID}' to generate a unique one for each sdk-app server.
-ueb_app_consumer_group_name = {UUID}
-
-decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
diff --git a/deliveries/properties_rackspace/ECOMPSDKAPP/system.properties b/deliveries/properties_rackspace/ECOMPSDKAPP/system.properties
deleted file mode 100644
index 105502f1..00000000
--- a/deliveries/properties_rackspace/ECOMPSDKAPP/system.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-# Properties read by ECOMP Core library, ecompSDK-core.jar
-
-##########################################################################
-# The following properties should NOT be changed by partner applications.
-##########################################################################
-
-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==
-
-##########################################################################
-# The following properties MAY require changes by partner applications.
-##########################################################################
-
-#Mysql
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://portal-db:3306/ecomp_sdk
-db.userName = root
-db.password = Aa123456
-db.min_pool_size = 5
-db.max_pool_size = 10
-hb.dialect = org.hibernate.dialect.MySQLDialect
-# SQL statements are logged to stdout
-hb.show_sql = true
-hb.idle_connection_test_period = 3600
-
-app_display_name = Demo App
-files_path = /tmp
-
-#element map files
-element_map_file_path = /tmp
-element_map_icon_path = app/fusionapp/icons/
-
-#Cron Schedules
-log_cron                      = 0 0/1 * * * ?;
-mylogins_feed_cron            = 0 0/60 * * * ?;
-#sessiontimeout_feed_cron	  = 0 * * * * ? *
-my_login_feed_output_dir      = /tmp/MyLogins
-
-# Link shown in Help menu
-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 
-# 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
-
-# R Cloud feature - configure this property to enable notebook feature - for more details on RCloud please visit https://rcloud.social/index.html
-guard_notebook_url=
-
-#authenticate user server
-authenticate_user_server=http://portal.openecomp.org:8383/openid-connect-server-webapp/allUsers
diff --git a/deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties b/deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties
deleted file mode 100644
index 7c95923f..00000000
--- a/deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-## General App Properties
-server.contextPath=/widget
-server.port=8082
-spring.http.multipart.max-file-size=128MB
-spring.http.multipart.max-request-size=128MB
-microservice.widget.location=/tmp
-
-## App DB Properties
-spring.datasource.url=jdbc:mysql://portal-db:3306/portal
-spring.datasource.username=root
-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
-spring.jpa.properties.hibernate.format_sql=false
-
-## Basic Authentication Properties
-security.user.name=widget_user
-security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718)
-
-initialization.default.widgets=true
-initialization.widgetData.url=http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/commonWidgets
-
-## Account Basic Authentication Properties
-account.user.name=portal
-account.user.password=6APqvG4AU2rfLgCvMdySwQ==
-
-## Certificate Properties
-#server.ssl.key-store=classpath:widget-keystore.p12
-#server.ssl.key-store-password=ENC(DiIYnAMab4u7rEW2yKhF9zBL00uU55q8)
-#server.ssl.keyStoreType=PKCS12
-#server.ssl.keyAlias=widget-microservice
-
-## Jasypt Properties
-jasypt.encryptor.password=EncryptionKey