<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>
<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>
"chef_type": "environment",
"default_attributes": {
+ "disableHttp": false,
"CS_VIP": "yyy",
"BE_VIP": "yyy",
"FE_VIP": "yyy",
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'],
owner "jetty"
group "jetty"
mode "0755"
- variables :https_port => "#{node['BE'][:https_port]}"
+ variables :BE_https_port => "#{node['BE'][:https_port]}"
end
- HTTP_IV_REMOTE_ADDRESS
- HTTP_CSP_WSTYPE
-
# catalog backend hostname
-beFqdn: <%= @host_ip %>
+beFqdn: <%= @catalog_ip %>
# catalog backend http port
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
- Abstract
- CVFC
-# validForResourceTypes usage
-# validForResourceTypes:
-# - VF
-# - VL
+
deploymentResourceArtifacts:
excludeResourceCategory:
- Generic
excludeResourceType:
- - PNF
+ - PNF
informationalResourceArtifacts:
features:
displayName: Features
MODEL_QUERY_SPEC:
acceptedTypes:
- xml
- UCPE_LAYER_2_CONFIGURATION:
- acceptedTypes:
- - xml
#AAI Artifacts
AAI_SERVICE_MODEL:
- xml
AAI_VF_INSTANCE_MODEL:
acceptedTypes:
- - xml
+ - xml
+ UCPE_LAYER_2_CONFIGURATION:
+ acceptedTypes:
+ - xml
OTHER:
acceptedTypes:
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
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
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
# 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
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 %>
# 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:
-
- &HTTP_CSP_ATTUID HTTP_CSP_ATTUID
- &csp-attuid csp-attuid
- -
- - &HTTP_CSP_WSTYPE HTTP_CSP_WSTYPE
- - &csp-wstype csp-wstype
optionalHeaderFields:
-
## Thread priority delta to give to acceptor threads
# jetty.http.acceptorPriorityDelta=0
-
-## HTTP Compliance: RFC7230, RFC2616, LEGACY
-# jetty.http.compliance=RFC7230
# HTTPS Socket.soLingerTime in seconds. (-1 to disable)
# https.soLingerTime=-1
-
-
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