diff options
| author |   Michael Lando <ml636r@att.com> | 2017-10-11 07:55:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-11 07:55:42 +0000 |
| commit | 44fdf15aabb3be980c57f8be437fed497e694b3b (patch) | |
| tree | ad1b7c3cdec09f1cebdda473d1fd20301623e09f | |
| parent | ec6d684513419a29cc577ea72eab4f0dde83cab1 (diff) | |
| parent | f9b17a1d3cbe0e6b3669004ad2d3e6968ae4c8f3 (diff) | |
Merge "Add PLAN type to configuration.yaml" into release-1.1.0
| -rw-r--r-- | catalog-be/src/main/resources/config/configuration.yaml | 3 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index eb26c8a34f..2ae2cccb77 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -328,6 +328,9 @@ serviceDeploymentArtifacts: PLAN: acceptedTypes: - xml + validForResourceTypes: + - VF + - VFC resourceDeploymentArtifacts: HEAT: 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 2217fa9346..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 @@ -431,6 +431,9 @@ resourceDeploymentArtifacts: PLAN: acceptedTypes: - xml + validForResourceTypes: + - VF + - VFC resourceInstanceDeploymentArtifacts: HEAT_ENV: |