diff options
| author |   Michael Lando <ml636r@att.com> | 2018-03-04 14:53:33 +0200 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-03-07 13:19:05 +0000 |
| commit | a5445100050e49e83f73424198d73cd72d672a4d (patch) | |
| tree | cacf4df817df31be23e4e790d1dda857bdae061e /asdctool/sdc-cassandra-init/chef-repo/cookbooks | |
| parent | 51157f92c21976cba4914c378aaa3cba49826931 (diff) | |
Sync Integ to Master
Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
Diffstat (limited to 'asdctool/sdc-cassandra-init/chef-repo/cookbooks')
| -rw-r--r-- | asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb index e16cb1a8e8..75a5d756c3 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb @@ -107,6 +107,7 @@ elasticSearch: creationPeriod: month - indexPrefix: monitoring_events creationPeriod: month + artifactTypes: - CHEF - PUPPET @@ -143,13 +144,25 @@ resourceTypes: &allResourceTypes - VF - VFCMT - Abstract + - CVFC # validForResourceTypes usage # validForResourceTypes: # - VF # - VL deploymentResourceArtifacts: - +# heat: +# displayName: "Base HEAT Template" +# type: HEAT +# validForResourceTypes: *allResourceTypes +# heatVol: +# displayName: "Volume HEAT Template" +# type: HEAT_VOL +# validForResourceTypes: *allResourceTypes +# heatNet: +# displayName: "Network HEAT Template" +# type: HEAT_NET +# validForResourceTypes: *allResourceTypes deploymentResourceInstanceArtifacts: heatEnv: @@ -179,6 +192,8 @@ toscaArtifacts: #Informational artifacts placeHolder excludeResourceCategory: - Generic +excludeResourceType: + - PNF informationalResourceArtifacts: features: displayName: Features @@ -265,13 +280,13 @@ serviceApiArtifacts: displayName: Testing type: OTHER - additionalInformationMaxNumberOfKeys: 50 systemMonitoring: enabled: true isProxy: false probeIntervalInSeconds: 15 + defaultHeatArtifactTimeoutMinutes: 60 serviceDeploymentArtifacts: @@ -287,6 +302,11 @@ serviceDeploymentArtifacts: MODEL_QUERY_SPEC: acceptedTypes: - xml + UCPE_LAYER_2_CONFIGURATION: + acceptedTypes: + - xml + +#AAI Artifacts AAI_SERVICE_MODEL: acceptedTypes: - xml @@ -299,7 +319,6 @@ serviceDeploymentArtifacts: OTHER: acceptedTypes: - resourceDeploymentArtifacts: HEAT: acceptedTypes: @@ -484,7 +503,15 @@ resourceInformationalArtifacts: validForResourceTypes: *allResourceTypes OTHER: acceptedTypes: - validForResourceTypes: *allResourceTypes + validForResourceTypes: + - VFC + - CVFC + - CP + - VL + - VF + - VFCMT + - Abstract + - PNF SNMP_POLL: acceptedTypes: validForResourceTypes: *allResourceTypes @@ -496,10 +523,10 @@ resourceInformationalArtifacts: validForResourceTypes: - VF - VFC + - CVFC resourceInformationalDeployedArtifacts: - requirementsToFulfillBeforeCert: capabilitiesToConsumeBeforeCert: @@ -587,7 +614,9 @@ vfModuleProperties: genericAssetNodeTypes: VFC: org.openecomp.resource.abstract.nodes.VFC + CVFC: org.openecomp.resource.abstract.nodes.VFC VF : org.openecomp.resource.abstract.nodes.VF + PNF: org.openecomp.resource.abstract.nodes.PNF Service: org.openecomp.resource.abstract.nodes.service workloadContext: Production |