diff options
author | Idan Amit <ia096e@intl.att.com> | 2017-10-11 13:54:30 +0300 |
---|---|---|
committer | Idan Amit <ia096e@intl.att.com> | 2017-10-11 13:54:30 +0300 |
commit | c4c4e2869573534bbf8154ff4b5aad3a87126c33 (patch) | |
tree | d5c6920b1eed38c6bfe19992e8334f5c2b285d17 /sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be | |
parent | 2423ebd2fbaa1e0fc4f123feb2ce25f1d118c937 (diff) |
Merged PLAN type changes into master
Merged changes regarding the PLAN artifact type from master branch into release-.1.1.0 branch
Change-Id: If53f06d734ca7ba791e4c578504c890c16755ddf
Issue-Id: SDC-420
Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be')
-rw-r--r-- | sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb | 20 |
1 files changed, 19 insertions, 1 deletions
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 df9e74ad51..a4be8b10d0 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 @@ -126,7 +126,7 @@ artifactTypes: - SNMP_POLL - SNMP_TRAP - GUIDE - + - PLAN licenseTypes: - User @@ -305,6 +305,11 @@ serviceDeploymentArtifacts: OTHER: acceptedTypes: +#PLAN + PLAN: + acceptedTypes: + - xml + resourceDeploymentArtifacts: HEAT: acceptedTypes: @@ -422,6 +427,14 @@ resourceDeploymentArtifacts: acceptedTypes: validForResourceTypes: *allResourceTypes +#PLAN + PLAN: + acceptedTypes: + - xml + validForResourceTypes: + - VF + - VFC + resourceInstanceDeploymentArtifacts: HEAT_ENV: acceptedTypes: @@ -459,6 +472,11 @@ resourceInstanceDeploymentArtifacts: acceptedTypes: validForResourceTypes: *allResourceTypes +#PLAN + PLAN: + acceptedTypes: + - xml + resourceInformationalArtifacts: CHEF: acceptedTypes: |