summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-be/src/main/webapp/WEB-INF/web.xml4
-rw-r--r--sdc-os-chef/environments/Template.json1
-rw-r--r--sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb2
-rw-r--r--sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb2
-rw-r--r--sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb45
-rw-r--r--sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb2
-rw-r--r--sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb13
-rw-r--r--sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb2
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb30
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-http-ini.erb3
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-https-ini.erb2
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb6
12 files changed, 70 insertions, 42 deletions
diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml
index 70f5ff229c..d68817f39d 100644
--- a/catalog-be/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-be/src/main/webapp/WEB-INF/web.xml
@@ -95,7 +95,7 @@
<init-param>
<param-name>swagger.api.basepath</param-name>
- <param-value>/sdc2/rest</param-value>
+ <param-value>:8080/sdc2/rest</param-value>
</init-param>
<init-param>
@@ -129,7 +129,7 @@
<init-param>
<param-name>swagger.api.basepath</param-name>
<!-- Check if second param can be added -->
- <param-value>/sdc</param-value>
+ <param-value>:8080/sdc</param-value>
</init-param>
<init-param>
diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json
index 9cd371f830..2109d71a16 100644
--- a/sdc-os-chef/environments/Template.json
+++ b/sdc-os-chef/environments/Template.json
@@ -8,6 +8,7 @@
"chef_type": "environment",
"default_attributes": {
+ "disableHttp": false,
"CS_VIP": "yyy",
"BE_VIP": "yyy",
"FE_VIP": "yyy",
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
index 067642fed9..baee9d97dc 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
@@ -24,7 +24,7 @@ template "catalog-be-config" do
group "jetty"
mode "0755"
variables({
- :host_ip => node['HOST_IP'],
+ :catalog_ip => node['HOST_IP'],
:catalog_port => node['BE'][:http_port],
:ssl_port => node['BE'][:https_port],
:cassandra_ip => node['Nodes']['CS'],
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb
index 046e3c6919..45055f95b8 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb
@@ -18,5 +18,5 @@ template "ssl-ini" do
owner "jetty"
group "jetty"
mode "0755"
- variables :https_port => "#{node['BE'][:https_port]}"
+ variables :BE_https_port => "#{node['BE'][:https_port]}"
end
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
index 8cff0a026a..9ed32d2939 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
@@ -5,9 +5,8 @@ identificationHeaderFields:
- HTTP_IV_REMOTE_ADDRESS
- HTTP_CSP_WSTYPE
-
# catalog backend hostname
-beFqdn: <%= @host_ip %>
+beFqdn: <%= @catalog_ip %>
# catalog backend http port
beHttpPort: <%= @catalog_port %>
@@ -16,11 +15,15 @@ beHttpPort: <%= @catalog_port %>
beContext: /sdc/rest/config/get
# catalog backend protocol
+<% if node[:disableHttp] -%>
+beProtocol: https
+<% else %>
beProtocol: http
+<% end -%>
# catalog backend ssl port
beSslPort: <%= @ssl_port %>
-version: 1.0
+version: 1.1.0
released: 2012-11-30
toscaConformanceLevel: 5.0
minToscaConformanceLevel: 3.0
@@ -143,10 +146,7 @@ resourceTypes: &allResourceTypes
- Abstract
- CVFC
-# validForResourceTypes usage
-# validForResourceTypes:
-# - VF
-# - VL
+
deploymentResourceArtifacts:
@@ -179,7 +179,7 @@ toscaArtifacts:
excludeResourceCategory:
- Generic
excludeResourceType:
- - PNF
+ - PNF
informationalResourceArtifacts:
features:
displayName: Features
@@ -288,9 +288,6 @@ serviceDeploymentArtifacts:
MODEL_QUERY_SPEC:
acceptedTypes:
- xml
- UCPE_LAYER_2_CONFIGURATION:
- acceptedTypes:
- - xml
#AAI Artifacts
AAI_SERVICE_MODEL:
@@ -301,7 +298,10 @@ serviceDeploymentArtifacts:
- xml
AAI_VF_INSTANCE_MODEL:
acceptedTypes:
- - xml
+ - xml
+ UCPE_LAYER_2_CONFIGURATION:
+ acceptedTypes:
+ - xml
OTHER:
acceptedTypes:
@@ -551,16 +551,29 @@ heatEnvArtifactHeader: ""
heatEnvArtifactFooter: ""
onboarding:
+ <% if node[:disableHttp] -%>
+ protocol: https
+ host: <%= @catalog_ip %>
+ port: <%= node['BE'][:https_port] %>
+ <% else %>
protocol: http
- host: <%= @host_ip %>
- port: <%= @catalog_port %>
+ host: <%= @catalog_ip %>
+ port: <%= node['BE'][:http_port] %>
+ <% end -%>
downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages"
healthCheckUri: "/onboarding-api/v1.0/healthcheck"
dcae:
+ <% if node[:disableHttp] -%>
+ protocol: https
+ host: <%= @catalog_ip %>
+ port: <%= node['BE'][:https_port] %>
+ <% else %>
protocol: http
- host: <%= @host_ip %>
- port: <%= @catalog_port %>
+ host: <%= @catalog_ip %>
+ port: <%= node['BE'][:http_port] %>
+ <% end -%>
+
healthCheckUri: "/dcae/healthCheck"
# #GSS IDNS
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb
index 7972d746ab..3491035fcf 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb
@@ -6,7 +6,7 @@ uebServers:
uebPublicKey: <%= node['UEB']['PublicKey'] %>
uebSecretKey: <%= node['UEB']['SecretKey'] %>
-distributionNotifTopicName: SDC-DISTR-NOTIF-TOPIC
+distributionNotifTopicName: SDC-DISTR-NOTIF-TOPIC
distributionStatusTopicName: SDC-DISTR-STATUS-TOPIC
initRetryIntervalSec: 5
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb
index a42c7bf206..18b69b3970 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb
@@ -10,16 +10,19 @@ storage.cassandra.ssl.enabled=false
storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore
storage.cassandra.ssl.truststore.password=Aa123456
-cache.db-cache = false
-cache.db-cache-clean-wait = 20
-cache.db-cache-time = 180000
-cache.db-cache-size = 0.5
-
storage.cassandra.read-consistency-level=LOCAL_QUORUM
storage.cassandra.write-consistency-level=LOCAL_QUORUM
storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.NetworkTopologyStrategy
storage.cassandra.replication-strategy-options=<%= @DC_NAME %>,<%= @rep_factor %>
storage.cassandra.astyanax.local-datacenter=<%= @DC_NAME %>
+
+cache.db-cache = false
+cache.db-cache-clean-wait = 20
+cache.db-cache-time = 180000
+cache.db-cache-size = 0.5
+
+cache.tx-cache-size = 1000000
+
storage.lock.retries=5
storage.lock.wait-time=500
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb
index effbfa7918..adfc0d0ce2 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb
@@ -8,7 +8,7 @@
# jetty.ssl.host=0.0.0.0
## Connector port to listen on
-jetty.ssl.port=<%= @https_port %>
+jetty.ssl.port=<%= @BE_https_port %>
## Connector idle timeout in milliseconds
# jetty.ssl.idleTimeout=30000
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
index 23ed9ba156..ea2d9033ab 100644
--- 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
@@ -11,7 +11,11 @@ beHttpPort: <%= @catalog_port %>
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 %>
@@ -22,20 +26,31 @@ 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:
- protocol: http
- host: <%= @fe_host_ip %>
- port: 8181
- healthCheckUri: "/onboarding/v1.0/healthcheck"
+ 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
- host: localhost
- port: 8181
+ port: <%= node['FE'][:http_port] %>
+ <% end -%>
healthCheckUri: "/dcae/healthCheck"
identificationHeaderFields:
@@ -48,9 +63,6 @@ identificationHeaderFields:
-
- &HTTP_CSP_ATTUID HTTP_CSP_ATTUID
- &csp-attuid csp-attuid
- -
- - &HTTP_CSP_WSTYPE HTTP_CSP_WSTYPE
- - &csp-wstype csp-wstype
optionalHeaderFields:
-
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
index 34a73fdf55..233a6b8852 100644
--- 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
@@ -27,6 +27,3 @@ jetty.http.idleTimeout=30000
## Thread priority delta to give to acceptor threads
# jetty.http.acceptorPriorityDelta=0
-
-## HTTP Compliance: RFC7230, RFC2616, LEGACY
-# jetty.http.compliance=RFC7230
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
index f8ca5252b0..d2542fc360 100644
--- 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
@@ -11,5 +11,3 @@ 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
index 4646661dfb..71ed876ee7 100644
--- 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
@@ -2,4 +2,8 @@ notifications:
pollingIntervalMsec: 2000
selectionSize: 100
beHost: <%= @catalog_ip %>
- beHttpPort: <%= @catalog_port %> \ No newline at end of file
+ <% if node[:disableHttp] -%>
+ beHttpPort: <%= node['BE'][:https_port] %>
+ <% else %>
+ beHttpPort: <%= node['BE'][:http_port] %>
+ <% end -%> \ No newline at end of file