diff options
| author |   Michael Lando <ml636r@att.com> | 2017-10-02 08:01:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-02 08:01:09 +0000 |
| commit | 0d376d76f0bb8acc0739ab08f8de765070de0553 (patch) | |
| tree | e525a9bc71cf62c159a4af1625da1cdf2d9774af | |
| parent | e3d0ba4edf87a1f5086f221b8f588256a4673abe (diff) | |
| parent | 97a089e7ca98b5317ee9e355bdadabe41b0fea7d (diff) | |
Merge "Add PLAN artifact type to configuration" into release-1.1.0
| -rw-r--r-- | catalog-be/src/main/resources/config/configuration.yaml | 2 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index d3f513fd74..eb26c8a34f 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -133,6 +133,7 @@ artifactTypes: - SNMP_POLL - SNMP_TRAP - GUIDE + - PLAN licenseTypes: - User @@ -327,7 +328,6 @@ serviceDeploymentArtifacts: PLAN: acceptedTypes: - xml - 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 df9e74ad51..36e53fdd64 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 @@ -304,6 +304,11 @@ serviceDeploymentArtifacts: - xml OTHER: acceptedTypes: + +#PLAN + PLAN: + acceptedTypes: + - xml resourceDeploymentArtifacts: HEAT: @@ -421,6 +426,11 @@ resourceDeploymentArtifacts: SNMP_TRAP: acceptedTypes: validForResourceTypes: *allResourceTypes + +#PLAN + PLAN: + acceptedTypes: + - xml resourceInstanceDeploymentArtifacts: HEAT_ENV: @@ -458,6 +468,11 @@ resourceInstanceDeploymentArtifacts: SNMP_TRAP: acceptedTypes: validForResourceTypes: *allResourceTypes + +#PLAN + PLAN: + acceptedTypes: + - xml resourceInformationalArtifacts: CHEF: |