From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Mon, 16 Sep 2019 12:04:02 +0000 (+0000)
Subject: Merge "renamed config-data->sdnc"
X-Git-Tag: 5.0.1-ONAP~58
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=73e71776a0036eeb5eff5a92eb15145ce1644eea;p=oom.git

Merge "renamed config-data->sdnc"
---

73e71776a0036eeb5eff5a92eb15145ce1644eea
diff --cc kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
index 59ef9bc0c3,b3bcd9933c..d2dacf8428
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
@@@ -16,13 -16,12 +16,13 @@@
  # Web server config
  ### START -Controller Blueprints Properties
  # Load Resource Source Mappings
- resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
+ resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability,rest=source-rest,script=source-capability
  
  # Controller Blueprints Core Configuration
 -controllerblueprints.blueprintDeployPath=/opt/app/onap/blueprints/deploy
 -controllerblueprints.blueprintArchivePath=/opt/app/onap/blueprints/archive
 -controllerblueprints.blueprintWorkingPath=/opt/app/onap/blueprints/working
 +# Blueprint Processor File Execution and Handling Properties
 +blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy
 +blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive
 +blueprintsprocessor.blueprintWorkingPath=/opt/app/onap/blueprints/working
  
  # Controller Blueprint Load Configurations
  # blueprints.load.initial-data may be overridden by ENV variables
diff --cc kubernetes/cds/charts/cds-controller-blueprints/resources/config/application.properties
index de295fba1b,1fd4a459b7..bfaa079d41
--- a/kubernetes/cds/charts/cds-controller-blueprints/resources/config/application.properties
+++ b/kubernetes/cds/charts/cds-controller-blueprints/resources/config/application.properties
@@@ -44,25 -44,24 +44,25 @@@ spring.jpa.hibernate.naming-strategy=or
  spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
  
  # Load Resource Source Mappings
- resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
+ resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability
  
  # Controller Blueprints Core Configuration
 -controllerblueprints.blueprintDeployPath=/etc/blueprints/deploy
 -controllerblueprints.blueprintArchivePath=/etc/blueprints/archive
 -controllerblueprints.blueprintWorkingPath=/etc/blueprints/work
 +# Blueprint Processor File Execution and Handling Properties
 +blueprintsprocessor.blueprintDeployPath=/etc/blueprints/deploy
 +blueprintsprocessor.blueprintArchivePath=/etc/blueprints/archive
 +blueprintsprocessor.blueprintWorkingPath=/etc/blueprints/work
  # Controller Blueprint Load Configurations
  # blueprints.load.initial-data may be overridden by ENV variables
 -controllerblueprints.loadInitialData={{ .Values.config.initDataLoad }}
 -controllerblueprints.loadBluePrint=true
 -controllerblueprints.loadBluePrintPaths=/opt/app/onap/model-catalog/blueprint-model/service-blueprint
 -controllerblueprints.loadModelType=true
 -controllerblueprints.loadModeTypePaths=/opt/app/onap/model-catalog/definition-type/starter-type
 -controllerblueprints.loadResourceDictionary=true
 -controllerblueprints.loadResourceDictionaryPaths=/opt/app/onap/model-catalog/resource-dictionary/starter-dictionary
 +blueprintsprocessor.loadInitialData={{ .Values.config.initDataLoad }}
 +blueprintsprocessor.loadBluePrint=true
 +blueprintsprocessor.loadBluePrintPaths=/opt/app/onap/model-catalog/blueprint-model/service-blueprint
 +blueprintsprocessor.loadModelType=true
 +blueprintsprocessor.loadModeTypePaths=/opt/app/onap/model-catalog/definition-type/starter-type
 +blueprintsprocessor.loadResourceDictionary=true
 +blueprintsprocessor.loadResourceDictionaryPaths=/opt/app/onap/model-catalog/resource-dictionary/starter-dictionary
  
  # CBA file extension
 -controllerblueprints.loadCbaExtension=zip
 +blueprintsprocessor.loadCbaExtension=zip
  
  # Web server config
  server.port=8080