From 503b229517a752ce1ebc5950deb823a4b428148e Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Sat, 21 Nov 2020 22:29:17 +0100 Subject: [CDS] Uses new tpls for repos / images This commit makes CDS chart to use the new generator for repositories and images. As new templates doesn't work well with "sub charts", we move also subcharts to components folder. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux Change-Id: I8156c8b568054b7eacf333196d877e12f7a52216 --- .../resources/config/application.properties | 161 --------------------- 1 file changed, 161 deletions(-) delete mode 100755 kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties (limited to 'kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties') diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties deleted file mode 100755 index a3d32a9a03..0000000000 --- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties +++ /dev/null @@ -1,161 +0,0 @@ -{{/* -# -# Copyright (c) 2017-2019 AT&T, IBM, Bell Canada, Nordix Foundation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Web server config -### START -Controller Blueprints Properties -# Load Resource Source Mappings -*/}} -resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability,rest=source-rest,vault-data=source-rest,script=source-capability - -# 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 - -# blueprints.load.initial-data may be overridden by ENV variables -blueprintsprocessor.loadInitialData=true -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 - -### END -Controller Blueprints Properties - -blueprintsprocessor.grpcEnable=true -blueprintsprocessor.httpPort=8080 -blueprintsprocessor.grpcPort=9111 - -# db -blueprintsprocessor.db.url=jdbc:mysql://{{.Values.config.cdsDB.dbServer}}:{{.Values.config.cdsDB.dbPort}}/{{.Values.config.cdsDB.dbName}} -blueprintsprocessor.db.username=${CDS_DB_USERNAME} -blueprintsprocessor.db.password=${CDS_DB_PASSWORD} -blueprintsprocessor.db.driverClassName=org.mariadb.jdbc.Driver -blueprintsprocessor.db.hibernateHbm2ddlAuto=update -blueprintsprocessor.db.hibernateDDLAuto=update -blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy -blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect - -# processor-db endpoint -blueprintsprocessor.db.processor-db.type=maria-db -blueprintsprocessor.db.processor-db.url=jdbc:mysql://{{ .Values.config.sdncDB.dbService }}:{{ .Values.config.sdncDB.dbPort }}/{{.Values.config.sdncDB.dbName}} -blueprintsprocessor.db.processor-db.username=${SDNC_DB_USERNAME} -blueprintsprocessor.db.processor-db.password=${SDNC_DB_PASSWORD} - -# Python executor -blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython/ccsdk_blueprints -blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython/ccsdk_blueprints,/opt/app/onap/scripts/jython/ccsdk_netconf,/opt/app/onap/scripts/jython/ccsdk_restconf - -security.user.password: {bcrypt}$2a$10$duaUzVUVW0YPQCSIbGEkQOXwafZGwQ/b32/Ys4R1iwSSawFgz7QNu -security.user.name: ccsdkapps - -# Error Managements -error.catalog.applicationId=cds -error.catalog.type=properties -error.catalog.errorDefinitionFileDirectory=/opt/app/onap/config - -# SDN-C's ODL Restconf Connection Details -blueprintsprocessor.restconfEnabled=true -blueprintsprocessor.restclient.sdncodl.type=basic-auth -blueprintsprocessor.restclient.sdncodl.url=http://{{ .Values.global.sdncOamService }}:{{ .Values.global.sdncOamPort }}/ -blueprintsprocessor.restclient.sdncodl.username=admin -blueprintsprocessor.restclient.sdncodl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - -# Executor Options -blueprintprocessor.resourceResolution.enabled=true -blueprintprocessor.netconfExecutor.enabled=true -blueprintprocessor.restConfExecutor.enabled=true -blueprintprocessor.remoteScriptCommand.enabled=true -blueprintsprocessor.remote-script-command.response.log.enabled=false - -# Command executor -blueprintsprocessor.grpcclient.remote-python.type=token-auth -blueprintsprocessor.grpcclient.remote-python.host=cds-command-executor -blueprintsprocessor.grpcclient.remote-python.port=50051 -blueprintsprocessor.grpcclient.remote-python.token=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== -blueprintsprocessor.grpcclient.py-executor.host=py-executor-default:50052 -blueprintsprocessor.grpcclient.py-executor.trustCertCollection=/opt/app/onap/config/certs/py-executor/py-executor-chain.pem -blueprintsprocessor.grpcclient.py-executor.type=tls-auth -# Config Data REST client settings -blueprintsprocessor.restclient.sdnc.type=basic-auth -blueprintsprocessor.restclient.sdnc.url=http://{{ .Values.global.sdncOamService }}:{{ .Values.global.sdncOamPort }} -blueprintsprocessor.restclient.sdnc.username=admin -blueprintsprocessor.restclient.sdnc.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - -# AAI Data REST Client settings -blueprintsprocessor.restclient.aai-data.type=basic-auth -blueprintsprocessor.restclient.aai-data.url=https://aai:8443 -blueprintsprocessor.restclient.aai-data.username=aai@aai.onap.org -blueprintsprocessor.restclient.aai-data.password=demo123456! -blueprintsprocessor.restclient.aai-data.additionalHeaders.X-TransactionId=cds-transaction-id -blueprintsprocessor.restclient.aai-data.additionalHeaders.X-FromAppId=cds-app-id -blueprintsprocessor.restclient.aai-data.additionalHeaders.Accept=application/json - -# Self Service Request Kafka Message Consumer -blueprintsprocessor.messageconsumer.self-service-api.kafkaEnable=false -blueprintsprocessor.messageconsumer.self-service-api.type=kafka-basic-auth -blueprintsprocessor.messageconsumer.self-service-api.bootstrapServers=message-router-kafka:9092 -blueprintsprocessor.messageconsumer.self-service-api.groupId=cds-consumer-group -blueprintsprocessor.messageconsumer.self-service-api.topic=cds-consumer -blueprintsprocessor.messageconsumer.self-service-api.clientId=cds-client -blueprintsprocessor.messageconsumer.self-service-api.pollMillSec=1000 - -# Self Service Response Kafka Message Producer -blueprintsprocessor.messageproducer.self-service-api.bootstrapServers=message-router-kafka:9092 - -# Kafka Audit Service Configurations -blueprintsprocessor.messageproducer.self-service-api.audit.kafkaEnable=false - -# Executor Options -blueprintsprocessor.resourceResolution.enabled=true -blueprintsprocessor.netconfExecutor.enabled=true -blueprintsprocessor.restConfExecutor.enabled=true -blueprintsprocessor.cliExecutor.enabled=true -blueprintsprocessor.remoteScriptCommand.enabled=true -## Enable py-executor -blueprintsprocessor.streamingRemoteExecution.enabled=true - -# Used in Health Check -blueprintsprocessor.messageproducer.self-service-api.type=kafka-basic-auth -blueprintsprocessor.messageproducer.self-service-api.clientId=cds-client -blueprintsprocessor.messageproducer.self-service-api.topic=cds-producer - - -#Encrypted username and password for health check service -endpoints.user.name=eHbVUbJAj4AG2522cSbrOQ== -endpoints.user.password=eHbVUbJAj4AG2522cSbrOQ== - -#BaseUrls for health check blueprint processor services -blueprintprocessor.healthcheck.baseUrl=http://localhost:8080/ -blueprintprocessor.healthcheck.mapping-service-name-with-service-link=[Execution service,/api/v1/execution-service/health-check],[Resources service,/api/v1/resources/health-check],[Template service,/api/v1/template/health-check] - -#BaseUrls for health check Cds Listener services -cdslistener.healthcheck.baseUrl=http://cds-sdc-listener:8080/ -cdslistener.healthcheck.mapping-service-name-with-service-link=[SDC Listener service,/api/v1/sdclistener/healthcheck] - -#Actuator properties -management.endpoints.web.exposure.include=* -management.endpoint.health.show-details=always - -#K8s Plugin properties -#Credentials are placeholders as k8s plugin has not authentication atm -blueprintprocessor.k8s.plugin.username=unused -blueprintprocessor.k8s.plugin.password=unused -blueprintprocessor.k8s.plugin.url=http://multicloud-k8s:9015/ -- cgit 1.2.3-korg