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=d6d034fcb604e07586558f907d8d1609032eb633;hb=5f3e9912406897ee18c424b940881ce08d59bb44;hp=5a059aae7d4bcc3d266c9546c7ea9e27cd961596;hpb=425040c807f03eaae14b3c02708533f4f546d9c6;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 5a059aae7d..d6d034fcb6 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 @@ -28,7 +28,7 @@ released: 2012-11-30 toscaConformanceLevel: 11.0 minToscaConformanceLevel: 3.0 -janusGraphCfgFile: /var/lib/jetty/config/catalog-be/janusgraph.properties +janusGraphCfgFile: <%= node['cassandra']['janusgraph_config_file'] %> janusGraphInMemoryGraph: false janusGraphLockTimeout: 1800 # The interval to try and reconnect to JanusGraph DB when it is down during ASDC startup: @@ -81,20 +81,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 +98,6 @@ cassandraConfig: username: <%= @cassandra_usr %> password: <%= @cassandra_pwd %> ssl: <%= @cassandra_ssl_enabled %> - truststorePath : /var/lib/jetty/etc/truststore - truststorePassword : <%= @cassandra_truststore_password %> keySpaces: - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} @@ -189,6 +173,7 @@ componentAllowedInstanceTypes: Service: "*": - VF + - VFC - CR - CP - PNF @@ -612,6 +597,17 @@ artifacts: acceptedTypes: - csar - zip + - type: ASD_PACKAGE + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - PNF + acceptedTypes: + - csar + - zip - type: HEAT_ENV categories: - DEPLOYMENT @@ -855,8 +851,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 @@ -945,7 +941,10 @@ onboarding: protocol: http port: <%= node['ONBOARDING_BE'][:http_port] %> <% end -%> - downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages" + getVspPackageUri: "/onboarding-api/v1.0/vendor-software-products/packages/%s?versionId=%s" # /onboarding-api/v1.0/vendor-software-products/packages/:vspId?versionId=:vspVersionId + getLatestVspPackageUri: "/onboarding-api/v1.0/vendor-software-products/packages/%s" # /onboarding-api/v1.0/vendor-software-products/packages/:vspId + getVspUri: "/onboarding-api/v1.0/vendor-software-products/%s/versions/%s" # /onboarding-api/v1.0/vendor-software-products/:vspId/versions/:vspVersionId + getLatestVspUri: "/onboarding-api/v1.0/vendor-software-products/%s" # /onboarding-api/v1.0/vendor-software-products/:vspId healthCheckUri: "/onboarding-api/v1.0/healthcheck" # #GSS IDNS @@ -989,8 +988,6 @@ toscaValidators: disableAudit: false -consumerBusinessLogic: true - vfModuleProperties: min_vf_module_instances: forBaseModule: 1 @@ -1014,8 +1011,18 @@ genericAssetNodeTypes: Service: org.openecomp.resource.abstract.nodes.service ETSI NFV Network Service: tosca.nodes.nfv.NS -serviceNodeTypes: - ETSI NFV Network Service: tosca.nodes.nfv.NS +# Defines the base types for Services +# : +# required: //if the base type is mandatory or not +# baseTypes: //the base types. Required if the base type is required. +# If not provided, the category will have no base type. +serviceBaseNodeTypes: + ETSI NFV Network Service: + required: true + baseTypes: + - tosca.nodes.nfv.NS + AutomationComposition: + required: false workloadContext: Production @@ -1120,8 +1127,6 @@ dmaapConsumerConfiguration: username: user password: aftDme2SslEnable: true - aftDme2ClientKeystore: /var/lib/jetty/etc/truststore - aftDme2ClientKeystorePassword: "" aftDme2ClientSslCertAlias: certman dmaapProducerConfiguration: @@ -1153,8 +1158,6 @@ dmaapProducerConfiguration: username: <%= node['DMAAP']['producer']['username'] %> password: <%= node['DMAAP']['producer']['password'] %> aftDme2SslEnable: true - aftDme2ClientKeystore: /var/lib/jetty/etc/truststore - aftDme2ClientKeystorePassword: <%= node['jetty']['dmaap_truststore_pwd'] %> aftDme2ClientSslCertAlias: certman @@ -1220,29 +1223,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.acm. + - tosca.nodes. # This configuration entry lists all Directives values that shall be allowed on SDC. directives: @@ -1250,3 +1235,24 @@ directives: - selectable - substitute - substitutable + +externalCsarStore: + storageType: NONE # NONE, MINIO + endpoint: + host: 127.0.0.1 + port: 9000 + secure: false + credentials: + 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 %>