summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef/sdc-frontend/chef-repo
diff options
context:
space:
mode:
authorYuli Shlosberg <ys9693@att.com>2018-02-15 12:04:46 +0200
committerYuli Shlosberg <ys9693@att.com>2018-02-21 17:28:40 +0200
commit958c32d2d7a3e5cbd9bc672645cdeb95a49b719a (patch)
tree1ba5b0d1dbece6daa5618a005d6281bbd5c7c1dc /sdc-os-chef/sdc-frontend/chef-repo
parent4cc47ac3abe00eda7c04b9955e56dafc819e2657 (diff)
OOM Alignment BE,FE,KBN
Change-Id: I8ff609a6be919d5709ce95af5a6a903aeb7afc43 Issue-ID: SDC-918 Signed-off-by: Yuli Shlosberg <ys9693@att.com>
Diffstat (limited to 'sdc-os-chef/sdc-frontend/chef-repo')
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb2
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-ecomp-error-configuration.yaml48
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml227
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-rest-configuration.yaml11
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystorebin4255 -> 0 bytes
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_1_cleanup_jettydir.rb57
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb45
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_3_errors_config.rb7
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb7
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_5_rest_configuration.rb7
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_6_locate_keystore.rb16
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb51
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb102
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-http-ini.erb29
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-https-ini.erb13
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb9
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb22
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ssl-ini.erb90
18 files changed, 0 insertions, 743 deletions
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb
deleted file mode 100644
index 6e9bbe36f5..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-#
-#
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-ecomp-error-configuration.yaml b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-ecomp-error-configuration.yaml
deleted file mode 100644
index 8982b2424f..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-ecomp-error-configuration.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-###########################################
-# Note the conventions of the field values:
-# type can be one of: CONFIG_ERROR, SYSTEM_ERROR, DATA_ERROR, CONNECTION_PROBLEM
-# severity can be one of: WARN, ERROR, FATAL
-# alarmSeverity can be one of: CRITICAL,MAJOR,MINOR,INFORMATIONAL,NONE
-# code is a unique integer in range of 3003-9999 (3000-3002 are occupied for internal usage)
-# The above enumeration values are out-of-the-box and can be changed in code.
-# In case of config and code mismatch, the appropriate error will be printed to log
-#
-# Range of FE codes - 8000-9999
-
-
-errors:
- FeHealthCheckConnectionError: {
- type: CONNECTION_PROBLEM,
- code: ASDC_8000,
- severity: ERROR,
- description: "Connection error during FE Health Check",
- alarmSeverity: CRITICAL
- }
- FeHttpLoggingError: {
- type: SYSTEM_ERROR,
- code: ASDC_8001,
- severity: ERROR,
- description: "Error when logging FE HTTP request/response",
- alarmSeverity: MINOR
- }
- FePortalServletError: {
- type: SYSTEM_ERROR,
- code: ASDC_8002,
- severity: ERROR,
- description: "Error when trying to access FE Portal page",
- alarmSeverity: MAJOR
- }
- FeHealthCheckGeneralError: {
- type: SYSTEM_ERROR,
- code: ASDC_8004,
- severity: ERROR,
- description: "General error during FE Health Check",
- alarmSeverity: CRITICAL
- }
- FeHealthCheckRecovery: {
- type: RECOVERY,
- code: ASDC_8005,
- severity: INFO,
- description: "BE Health Check Recovery",
- alarmSeverity: INFORMATIONAL
- } \ No newline at end of file
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml
deleted file mode 100644
index 2f793f386b..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="5 seconds">
-
- <property scope="system" name="ECOMP-component-name" value="ASDC" />
- <property scope="system" name="ECOMP-subcomponent-name" value="ASDC-FE" />
- <property file="${config.home}/catalog-fe/configuration.yaml" />
- <property scope="context" name="enable-all-log" value="false" />
-
- <!-- value used by pattern field list (| - is inter-field separator, || - unavailable or not applicable field value) (m - mandatory, o- optional)-->
- <!--timestamp(m)| requestID(m)| serviceInstanceID(o)| threadID(m)| physicalServerName(o)| serviceName(m)| userID(m)| logLevel(m)| severity(o)| serverIpAddress(m)| serverName(m)| clientIpAddress(o)| className(m)| timer(o)| detailedMessage(o)-->
- <property name="default-log-pattern"
- value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{uuid}|%X{serviceInstanceID}|%thread||${ECOMP-subcomponent-name}|%X{userId}|%level|%X{alarmSeverity}|%X{localAddr}|${feFqdn}|%X{remoteAddr}|%logger{35}|%X{timer}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
-
- <!-- All log -->
- <if condition='property("enable-all-log").equalsIgnoreCase("true")'>
- <then>
- <appender name="ALL_ROLLING"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log
- </file>
-
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>10</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>20MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>${default-log-pattern}</pattern>
- </encoder>
- </appender>
-
- <appender name="ASYNC_ALL" class="ch.qos.logback.classic.AsyncAppender">
- <appender-ref ref="ALL_ROLLING" />
- </appender>
- </then>
- </if>
-
- <!-- Error log -->
- <appender name="ERROR_ROLLING"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/error.log
- </file>
-
- <!-- Audit messages filter - deny audit messages -->
- <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
- <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
- <marker>AUDIT_MARKER</marker>
- </evaluator>
- <onMismatch>NEUTRAL</onMismatch>
- <onMatch>DENY</onMatch>
- </filter>
-
- <!-- Transaction messages filter - deny Transaction messages -->
- <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
- <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
- <marker>TRANSACTION_MARKER</marker>
- </evaluator>
- <onMismatch>NEUTRAL</onMismatch>
- <onMatch>DENY</onMatch>
- </filter>
-
- <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <level>INFO</level>
- </filter>
-
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/error.log.%i
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>10</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>20MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>${default-log-pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- Debug log -->
- <appender name="DEBUG_ROLLING"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log
- </file>
-
- <!-- No need to deny audit messages - they are INFO only, will be denied
- anyway -->
- <!-- Transaction messages filter - deny Transaction messages, there are
- some DEBUG level messages among them -->
- <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
- <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
- <marker>TRANSACTION_MARKER</marker>
- </evaluator>
- <onMismatch>NEUTRAL</onMismatch>
- <onMatch>DENY</onMatch>
- </filter>
-
- <!-- accept DEBUG and TRACE level -->
- <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
- <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
- <expression>
- e.level.toInt() &lt;= DEBUG.toInt()
- </expression>
- </evaluator>
- <OnMismatch>DENY</OnMismatch>
- <OnMatch>NEUTRAL</OnMatch>
- </filter>
-
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log.%i
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>10</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>20MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>${default-log-pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- Audit log -->
- <appender name="AUDIT_ROLLING"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
-
- <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/audit.log
- </file>
-
- <!-- Audit messages filter - accept audit messages -->
- <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
- <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
- <marker>AUDIT_MARKER</marker>
- </evaluator>
- <onMismatch>DENY</onMismatch>
- <onMatch>ACCEPT</onMatch>
- </filter>
-
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/audit.log.%i
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>10</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>20MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>${default-log-pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- SdncTransaction log -->
- <appender name="TRANSACTION_ROLLING"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
-
- <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/transaction.log
- </file>
-
- <!-- Transaction messages filter - accept audit messages -->
- <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
- <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
- <marker>TRANSACTION_MARKER</marker>
- </evaluator>
- <onMismatch>DENY</onMismatch>
- <onMatch>ACCEPT</onMatch>
- </filter>
-
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/transaction.log.%i
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>10</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>20MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>${default-log-pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- Asynchronicity Configurations -->
- <appender name="ASYNC_DEBUG" class="ch.qos.logback.classic.AsyncAppender">
- <appender-ref ref="DEBUG_ROLLING" />
- </appender>
-
- <appender name="ASYNC_TRANSACTION" class="ch.qos.logback.classic.AsyncAppender">
- <appender-ref ref="TRANSACTION_ROLLING" />
- </appender>
-
- <appender name="ASYNC_ERROR" class="ch.qos.logback.classic.AsyncAppender">
- <appender-ref ref="ERROR_ROLLING" />
- </appender>
-
-
- <root level="INFO">
- <appender-ref ref="ASYNC_ERROR" />
- <appender-ref ref="ASYNC_DEBUG" />
- <appender-ref ref="AUDIT_ROLLING" />
- <appender-ref ref="ASYNC_TRANSACTION" />
- <if condition='property("enable-all-log").equalsIgnoreCase("true")'>
- <then>
- <appender-ref ref="ALL_ROLLING" />
- </then>
- </if>
- </root>
-
- <logger name="org.openecomp.sdc" level="INFO" />
-</configuration>
-
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-rest-configuration.yaml b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-rest-configuration.yaml
deleted file mode 100644
index ecedafea56..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-rest-configuration.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# rest read timeout - means no timeout
-readTimeoutInSec: 0
-
-# whether to ignore certificate
-ignoreCertificate: false
-
-# the connection pool size
-connectionPoolSize: 10
-
-# create connection timeout
-connectTimeoutInSec: 10
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore
deleted file mode 100644
index c4083931dc..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore
+++ /dev/null
Binary files differ
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_1_cleanup_jettydir.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_1_cleanup_jettydir.rb
deleted file mode 100644
index 25983700d2..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_1_cleanup_jettydir.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#directory "FE_tempdir_cleanup" do
-# path "/var/lib/jetty/tempdir"
-# recursive true
-# action :delete
-#end
-
-
-directory "FE_tempdir_creation" do
- path "/var/lib/jetty/temp"
- owner 'jetty'
- group 'jetty'
- mode '0755'
- action :create
-end
-
-
-#directory "FE_webapps_cleanup" do
-# path "/var/lib/jetty/webapps"
-# recursive true
-# action :delete
-#end
-
-
-#directory "FE_webapps_creation" do
-# path "/var/lib/jetty/webapps"
-# owner 'jetty'
-# group 'jetty'
-# mode '0755'
-# action :create
-#end
-
-
-directory "FE_create_config_dir" do
- path "/var/lib/jetty/config"
- owner 'jetty'
- group 'jetty'
- mode '0755'
- action :create
-end
-
-
-directory "FE_create_catalog-fe" do
- path "/var/lib/jetty/config/catalog-fe"
- owner 'jetty'
- group 'jetty'
- mode '0755'
- action :create
-end
-
-
-directory "FE_create_catalog-fe" do
- path "/var/lib/jetty/config/onboarding-fe"
- owner 'jetty'
- group 'jetty'
- mode '0755'
- action :create
-end \ No newline at end of file
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
deleted file mode 100644
index 9e5953c394..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-jetty_base="/var/lib/jetty"
-
-
-template "catalog-fe-config" do
- path "#{jetty_base}/config/catalog-fe/configuration.yaml"
- source "FE-configuration.yaml.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables({
- :fe_host_ip => node['HOST_IP'],
- :be_host_ip => node['HOST_IP'],
- :kb_host_ip => node['HOST_IP'],
- :catalog_port => node['BE'][:http_port],
- :ssl_port => node['BE'][:https_port]
- })
-end
-
-template "plugins-fe-config" do
- path "#{jetty_base}/config/catalog-fe/plugins-configuration.yaml"
- source "FE-plugins-configuration.yaml.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables({
- :dcae_discovery_url => node['Plugins']['DCAE']['dcae_discovery_url'],
- :dcae_source_url => node['Plugins']['DCAE']['dcae_source_url'],
- :workflow_discovery_url => node['Plugins']['WORKFLOW']['workflow_discovery_url'],
- :workflow_source_url => node['Plugins']['WORKFLOW']['workflow_source_url']
- })
-end
-
-
-template "onboarding-fe-config" do
- path "#{jetty_base}/config/onboarding-fe/onboarding_configuration.yaml"
- source "FE-onboarding-configuration.yaml.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables({
- :catalog_ip => node['HOST_IP'],
- :catalog_port => node['BE'][:http_port],
- :ssl_port => node['BE'][:https_port]
-})
-end \ No newline at end of file
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_3_errors_config.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_3_errors_config.rb
deleted file mode 100644
index 278c3bb35d..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_3_errors_config.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-cookbook_file "/var/lib/jetty/config/catalog-fe/ecomp-error-configuration.yaml" do
- source "FE-ecomp-error-configuration.yaml"
- mode 0755
- owner "jetty"
- group "jetty"
-end
-
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb
deleted file mode 100644
index 674febb47a..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-cookbook_file "/var/lib/jetty/config/catalog-fe/logback.xml" do
- source "FE-logback.xml"
- mode 0755
- owner "jetty"
- group "jetty"
-end
-
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_5_rest_configuration.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_5_rest_configuration.rb
deleted file mode 100644
index 710286a8dd..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_5_rest_configuration.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-cookbook_file "/var/lib/jetty/config/catalog-fe/rest-configuration-info.yaml" do
- source "FE-rest-configuration.yaml"
- mode 0755
- owner "jetty"
- group "jetty"
-end
-
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_6_locate_keystore.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_6_locate_keystore.rb
deleted file mode 100644
index bdf0d37b28..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_6_locate_keystore.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-jetty_base="/var/lib/jetty"
-
-directory "Jetty_etcdir_creation" do
- path "/#{jetty_base}/etc"
- owner 'jetty'
- group 'jetty'
- mode '0755'
- action :create
-end
-
-cookbook_file "/#{jetty_base}/etc/keystore" do
- source "keystore"
- owner "jetty"
- group "jetty"
- mode 0755
-end
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb
deleted file mode 100644
index 5497576f8f..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-jetty_base="/var/lib/jetty"
-jetty_home="/usr/local/jetty"
-
-###### create Jetty modules
-bash "create-jetty-modules" do
-cwd "#{jetty_base}"
-code <<-EOH
- cd "#{jetty_base}"
- java -jar "/#{jetty_home}"/start.jar --add-to-start=deploy
- java -jar "/#{jetty_home}"/start.jar --add-to-startd=http,https,logging,setuid
-EOH
-not_if "ls /#{jetty_base}/start.d/https.ini"
-end
-
-
-###### configure Jetty modules
-template "FE-http-ini" do
- path "/#{jetty_base}/start.d/http.ini"
- source "FE-http-ini.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables :FE_http_port => "#{node['FE'][:http_port]}"
-end
-
-
-template "FE-https-ini" do
- path "/#{jetty_base}/start.d/https.ini"
- source "FE-https-ini.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables :FE_https_port => "#{node['FE'][:https_port]}"
-end
-
-
-template "ssl-ini" do
- path "/#{jetty_base}/start.d/ssl.ini"
- source "ssl-ini.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables :https_port => "#{node['FE'][:https_port]}"
-end
-
-bash "echo status" do
- code <<-EOH
- echo "###### DOCKER STARTED #####"
- EOH
-end
-
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
deleted file mode 100644
index ea2d9033ab..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
+++ /dev/null
@@ -1,102 +0,0 @@
-# Needed for logging purposes. To be populated by DevOps - currently dummy
-feFqdn: <%= @fe_host_ip %>
-
-# catalog backend hostname
-beHost: <%= @be_host_ip %>
-
-# catalog backend http port
-beHttpPort: <%= @catalog_port %>
-
-# catalog backend http context
-beContext: /sdc2/rest/v1/catalog/upload/resources
-
-# catalog backend protocol
-<% if node[:disableHttp] -%>
-beProtocol: https
-<% else %>
-beProtocol: http
-<% end -%>
-
-# catalog backend ssl port
-beSslPort: <%= @ssl_port %>
-
-# threadpool size for handling requests
-threadpoolSize: 50
-
-# request processing timeout (seconds)
-requestTimeout: 10
-
-# Determines the health check read timeout when invoking health check towards the LB (or BE whatever is configured):
-healthCheckSocketTimeoutInMs: 5000
-
-healthCheckIntervalInSeconds: 5
-
-onboarding:
- host: <%= @fe_host_ip %>
- <% if node[:disableHttp] -%>
- protocol: https
- port: <%= node['FE'][:https_port] %>
- <% else %>
- protocol: http
- port: <%= node['FE'][:http_port] %>
- <% end -%>
- healthCheckUri: "/onboarding/v1.0/healthcheck"
-
-dcae:
- host: <%= @fe_host_ip %>
- <% if node[:disableHttp] -%>
- protocol: https
- port: <%= node['FE'][:https_port] %>
- <% else %>
- protocol: http
- port: <%= node['FE'][:http_port] %>
- <% end -%>
- healthCheckUri: "/dcae/healthCheck"
-
-identificationHeaderFields:
- -
- - &HTTP_IV_USER HTTP_IV_USER
- - &iv-user iv-user
- -
- - &USER_ID USER_ID
- - &user-id user-id
- -
- - &HTTP_CSP_ATTUID HTTP_CSP_ATTUID
- - &csp-attuid csp-attuid
-
-optionalHeaderFields:
- -
- - &HTTP_CSP_FIRSTNAME HTTP_CSP_FIRSTNAME
- - &csp-firstname csp-firstname
- -
- - &HTTP_CSP_LASTNAME HTTP_CSP_LASTNAME
- - &csp-lastname csp-lastname
- -
- - &HTTP_IV_REMOTE_ADDRESS HTTP_IV_REMOTE_ADDRESS
- - &iv-remote-address iv-remote-address
- -
- - &HTTP_CSP_EMAIL HTTP_CSP_EMAIL
- - &csp-email csp-email
-
-version: 1.0
-released: 2012-11-30
-
-# Connection parameters
-connection:
- url: jdbc:mysql://localhost:3306/db
- poolSize: 17
-
-# Protocols
-protocols:
- - http
- - https
-
-
-systemMonitoring:
- enabled: false
- isProxy: true
- probeIntervalInSeconds: 15
-
-kibanaHost: <%= @kb_host_ip %>
-kibanaPort: 5601
-kibanaProtocol: http
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-http-ini.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-http-ini.erb
deleted file mode 100644
index 233a6b8852..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-http-ini.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-# ---------------------------------------
-# Module: http
---module=http
-
-### HTTP Connector Configuration
-
-## Connector host/address to bind to
-# jetty.http.host=0.0.0.0
-
-## Connector port to listen on
-jetty.http.port=<%= @FE_http_port %>
-
-## Connector idle timeout in milliseconds
-jetty.http.idleTimeout=30000
-
-## Connector socket linger time in seconds (-1 to disable)
-# jetty.http.soLingerTime=-1
-
-## Number of acceptors (-1 picks default based on number of cores)
-# jetty.http.acceptors=-1
-
-## Number of selectors (-1 picks default based on number of cores)
-# jetty.http.selectors=-1
-
-## ServerSocketChannel backlog (0 picks platform default)
-# jetty.http.acceptorQueueSize=0
-
-## Thread priority delta to give to acceptor threads
-# jetty.http.acceptorPriorityDelta=0
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-https-ini.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-https-ini.erb
deleted file mode 100644
index d2542fc360..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-https-ini.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-# ---------------------------------------
-# Module: https
---module=https
-
-## HTTPS Configuration
-# HTTP port to listen on
-https.port=<%= @FE_https_port %>
-
-# HTTPS idle timeout in milliseconds
-jetty.https.idleTimeout=300000
-
-# HTTPS Socket.soLingerTime in seconds. (-1 to disable)
-# https.soLingerTime=-1
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb
deleted file mode 100644
index 71ed876ee7..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-notifications:
- pollingIntervalMsec: 2000
- selectionSize: 100
- beHost: <%= @catalog_ip %>
- <% if node[:disableHttp] -%>
- beHttpPort: <%= node['BE'][:https_port] %>
- <% else %>
- beHttpPort: <%= node['BE'][:http_port] %>
- <% end -%> \ No newline at end of file
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
deleted file mode 100644
index a21a7abbe5..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-pluginsList:
- - pluginId: DCAE
- pluginDiscoveryUrl: <%= @dcae_discovery_url %>
- pluginSourceUrl: <%= @dcae_source_url %>
- pluginStateUrl: "dcae"
- pluginDisplayOptions:
- context:
- displayName: "Monitoring"
- displayContext: ["SERVICE"]
- displayRoles: ["DESIGNER"]
- - pluginId: WORKFLOW
- pluginDiscoveryUrl: <%= @workflow_discovery_url %>
- pluginSourceUrl: <%= @workflow_source_url %>
- pluginStateUrl: "workflowDesigner"
- pluginDisplayOptions:
- tab:
- displayName: "WORKFLOW"
- displayRoles: ["DESIGNER", "TESTER"]
- context:
- displayName: "Workflow Designer"
- displayContext: ["VF"]
- displayRoles: ["DESIGNER", "TESTER"] \ No newline at end of file
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ssl-ini.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ssl-ini.erb
deleted file mode 100644
index effbfa7918..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ssl-ini.erb
+++ /dev/null
@@ -1,90 +0,0 @@
-# ---------------------------------------
-# Module: ssl
---module=ssl
-
-### TLS(SSL) Connector Configuration
-
-## Connector host/address to bind to
-# jetty.ssl.host=0.0.0.0
-
-## Connector port to listen on
-jetty.ssl.port=<%= @https_port %>
-
-## Connector idle timeout in milliseconds
-# jetty.ssl.idleTimeout=30000
-
-## Connector socket linger time in seconds (-1 to disable)
-# jetty.ssl.soLingerTime=-1
-
-## Number of acceptors (-1 picks default based on number of cores)
-# jetty.ssl.acceptors=-1
-
-## Number of selectors (-1 picks default based on number of cores)
-# jetty.ssl.selectors=-1
-
-## ServerSocketChannel backlog (0 picks platform default)
-# jetty.ssl.acceptorQueueSize=0
-
-## Thread priority delta to give to acceptor threads
-# jetty.ssl.acceptorPriorityDelta=0
-
-## Whether request host names are checked to match any SNI names
-# jetty.ssl.sniHostCheck=true
-
-## max age in seconds for a Strict-Transport-Security response header (default -1)
-# jetty.ssl.stsMaxAgeSeconds=31536000
-
-## include subdomain property in any Strict-Transport-Security header (default false)
-# jetty.ssl.stsIncludeSubdomains=true
-
-### SslContextFactory Configuration
-## Note that OBF passwords are not secure, just protected from casual observation
-## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html
-
-## Keystore file path (relative to $jetty.base)
-# jetty.sslContext.keyStorePath=etc/keystore
-
-## Truststore file path (relative to $jetty.base)
-# jetty.sslContext.trustStorePath=etc/keystore
-
-## Keystore password
-# jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-jetty.sslContext.keyStorePassword=OBF:1cp61iuj194s194u194w194y1is31cok
-
-## Keystore type and provider
-# jetty.sslContext.keyStoreType=JKS
-# jetty.sslContext.keyStoreProvider=
-
-## KeyManager password
-# jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g
-jetty.sslContext.keyManagerPassword=OBF:1cp61iuj194s194u194w194y1is31cok
-
-## Truststore password
-# jetty.sslContext.trustStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-jetty.sslContext.trustStorePassword=OBF:1cp61iuj194s194u194w194y1is31cok
-
-## Truststore type and provider
-# jetty.sslContext.trustStoreType=JKS
-# jetty.sslContext.trustStoreProvider=
-
-## whether client certificate authentication is required
-# jetty.sslContext.needClientAuth=false
-
-## Whether client certificate authentication is desired
-# jetty.sslContext.wantClientAuth=false
-
-## Whether cipher order is significant (since java 8 only)
-# jetty.sslContext.useCipherSuitesOrder=true
-
-## To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at
-## https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
-
-## Set the size of the SslSession cache
-# jetty.sslContext.sslSessionCacheSize=-1
-
-## Set the timeout (in seconds) of the SslSession cache timeout
-# jetty.sslContext.sslSessionTimeout=-1
-
-## Allow SSL renegotiation
-# jetty.sslContext.renegotiationAllowed=true
-# jetty.sslContext.renegotiationLimit=5