X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fdocker%2Fbackend%2Fchef-repo%2Fcookbooks%2Fsdc-catalog-be%2Ftemplates%2Fdefault%2FBE-configuration.yaml.erb;h=3f5ec422ad2fa3f05a476d594fbaac0182671833;hb=c6d49ae4af0b13bd0f75a878ffa88487ef38afc2;hp=5a025548f72b5a6f14a155243e8c150a6d0f2e3c;hpb=17862485d3475a81aa836f84609ec1a2b69b1d64;p=sdc.git

diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
index 5a025548f7..3f5ec422ad 100644
--- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
+++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
@@ -21,6 +21,10 @@ beProtocol: https
 beProtocol: http
 <% end -%>
 
+tlsCert: <%= node['BE']['tls_cert'] %>
+tlsKey: <%= node['BE']['tls_key'] %>
+caCert: <%= node['BE']['ca_cert'] %>
+
 # catalog backend ssl port
 beSslPort: <%= @ssl_port %>
 version: 1.1.0
@@ -81,20 +85,6 @@ users:
     tom: passwd
     bob: passwd
 
-# access restriction
-authCookie:
-  securityKey: "sdcaccessrestrictionsecureykey"
-  maxSessionTimeOut: 86400000
-  sessionIdleTimeOut: 3600000
-  cookieName: "AuthenticationCookie"
-  path: /
-  domain: ""
-  isHttpOnly: true
-  # redirect variable name from portal.properties file
-  redirectURL: ""
-  excludedUrls: [<%= node['access_restriction']['excluded_urls'] %>]
-  onboardingExcludedUrls: [<%= node['access_restriction']['excluded_urls_onboarding'] %>]
-
 basicAuth:
   enabled: <%= @basic_auth_flag %>
   userName: <%= @user_name %>
@@ -112,8 +102,10 @@ cassandraConfig:
     username: <%= @cassandra_usr %>
     password: <%= @cassandra_pwd %>
     ssl: <%= @cassandra_ssl_enabled %>
-    truststorePath : <%= node['jetty']['truststore_path'] %>
-    truststorePassword : <%= @cassandra_truststore_password %>
+    keystorePath: <%= @cassandra_keystore_password %>
+    keystorePassword: <%= @cassandra_ssl_enabled %>
+    truststorePath: <%= @cassandra_truststore_path %>
+    truststorePassword: <%= @cassandra_truststore_password %>
     keySpaces:
         - { name: dox,           replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']}
         - { name: sdcaudit,      replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']}
@@ -121,7 +113,6 @@ cassandraConfig:
         - { name: sdccomponent,  replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']}
         - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']}
 
-
 licenseTypes:
    - User
    - Installation
@@ -613,6 +604,17 @@ artifacts:
     acceptedTypes:
       - csar
       - zip
+  - type: ASD_PACKAGE
+    categories:
+      - DEPLOYMENT
+    componentTypes:
+      - RESOURCE
+    resourceTypes:
+      - VF
+      - PNF
+    acceptedTypes:
+      - csar
+      - zip
   - type: HEAT_ENV
     categories:
       - DEPLOYMENT
@@ -856,8 +858,8 @@ informationalServiceArtifacts:
   summaryOfImpactsToECOMPElements:
       displayName: Summary of impacts to ECOMP elements,OSSs, BSSs
       type: OTHER
-  controlLoopFunctions:
-      displayName: Control Loop Functions
+  automationCompositionFunctions:
+      displayName: Automation Composition Functions
       type: OTHER
   dimensioningInfo:
       displayName: Dimensioning Info
@@ -910,7 +912,6 @@ serviceApiArtifacts:
       displayName: Testing
       type: OTHER
 
-
 additionalInformationMaxNumberOfKeys: 50
 
 systemMonitoring:
@@ -993,8 +994,6 @@ toscaValidators:
 
 disableAudit: false
 
-consumerBusinessLogic: true
-
 vfModuleProperties:
     min_vf_module_instances:
         forBaseModule: 1
@@ -1028,7 +1027,7 @@ serviceBaseNodeTypes:
     required: true
     baseTypes:
       - tosca.nodes.nfv.NS
-  ControlLoop:
+  AutomationComposition:
     required: false
 
 workloadContext: Production
@@ -1134,8 +1133,6 @@ dmaapConsumerConfiguration:
         username: user
         password:
     aftDme2SslEnable: true
-    aftDme2ClientKeystore: <%= node['jetty']['truststore_path'] %>
-    aftDme2ClientKeystorePassword: ""
     aftDme2ClientSslCertAlias: certman
 
 dmaapProducerConfiguration:
@@ -1167,11 +1164,8 @@ dmaapProducerConfiguration:
         username: <%= node['DMAAP']['producer']['username'] %>
         password: <%= node['DMAAP']['producer']['password'] %>
     aftDme2SslEnable: true
-    aftDme2ClientKeystore: <%= node['jetty']['truststore_path'] %>
-    aftDme2ClientKeystorePassword: <%= node['jetty']['dmaap_truststore_pwd'] %>
     aftDme2ClientSslCertAlias: certman
 
-
 # ToDo: AF - had to remove due to configuration laod class failure
 #dmeConfiguration:
 #    lookupUriFormat: "http://DME2RESOLVE/service=%s/version=1.0.0/envContext=%s/routeOffer=DEFAULT"
@@ -1234,30 +1228,11 @@ supportAllottedResourcesAndProxy: true
 deleteLockTimeoutInSeconds: 60
 maxDeleteComponents: 10
 
-# Cadi filter (access restriction) Parameters
-aafNamespace:  <%= node['aafNamespace'] %>
-aafAuthNeeded:  <%= node['access_restriction']['aafAuthNeeded'] %>
-
-cadiFilterParams:
-    AFT_LATITUDE:  "32.780140"
-    AFT_LONGITUDE: "-96.800451"
-    hostname: <%= node['BE_VIP'] %>
-    aaf_id: <%= node['access_restriction']['aaf_id'] %>
-    aaf_env: <%= node['access_restriction']['aaf_env'] %>
-    aaf_url: <%= node['access_restriction']['aaf_url'] %>
-    csp_domain: <%= node['access_restriction']['csp_domain'] %>
-    cadi_keyfile: <%= node['access_restriction']['cadi_keyfile'] %>
-    aaf_password: <%= node['access_restriction']['aaf_password'] %>
-    cadi_loglevel: <%= node['access_restriction']['cadi_loglevel'] %>
-    AFT_ENVIRONMENT: <%= node['access_restriction']['AFT_ENVIRONMENT'] %>
-    cadiX509Issuers: <%= node['access_restriction']['cadiX509Issuers'] %>
-    cadi_truststore: <%= node['access_restriction']['cadi_truststore'] %>
-    cadi_truststore_password: <%= node['access_restriction']['cadi_truststore_password'] %>
-
 # This configuration entry lists all node type names prefix that shall be allowed on SDC.
 definedResourceNamespace:
   - org.openecomp.resource.
-  - org.onap.policy.clamp.controlloop.
+  - org.onap.policy.clamp.acm.
+  - tosca.nodes.
 
 # This configuration entry lists all Directives values that shall be allowed on SDC.
 directives:
@@ -1276,3 +1251,13 @@ externalCsarStore:
     accessKey: "login"
     secretKey: "password"
   tempPath: "/home/onap/temp/"
+  uploadPartSize: 200000000
+
+#This configuration specifies the delimiter used to differentiate instance name and count
+componentInstanceCounterDelimiter: " "
+
+# Comma separated list of excluded URLs by the DataValidatorFilter
+dataValidatorFilterExcludedUrls: "/healthCheck,/followed,/authorize"
+
+#Space separated list of permitted ancestors
+permittedAncestors: <%= @permittedAncestors %>