diff options
Diffstat (limited to 'policy-management')
| -rw-r--r-- | policy-management/src/main/server-gen/bin/features | 25 | ||||
| -rw-r--r-- | policy-management/src/main/server/config/policy-engine.properties | 34 |
2 files changed, 20 insertions, 39 deletions
diff --git a/policy-management/src/main/server-gen/bin/features b/policy-management/src/main/server-gen/bin/features index 676ce38d..861806aa 100644 --- a/policy-management/src/main/server-gen/bin/features +++ b/policy-management/src/main/server-gen/bin/features @@ -4,7 +4,7 @@ # ============LICENSE_START======================================================= # ONAP POLICY # ================================================================================ -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -157,7 +157,6 @@ CONFIG=${POLICY_HOME}/config BIN=${POLICY_HOME}/bin DB=${POLICY_HOME}/etc/db/migration FEATURES=${POLICY_HOME}/features -PROFILED=${POLICY_HOME}/etc/profile.d if [[ ! ( -d "${LIB}" && -x "${LIB}" ) ]]; then echo "error: no ${LIB} directory" @@ -189,7 +188,6 @@ FEATURE_SQL="sql" UPGRADE_SQL_SUFFIX=".upgrade.sql" DOWNGRADE_SQL_SUFFIX=".downgrade.sql" -ENVIRONMENT_SUFFIX=".environment" featureJars=$(find "${FEATURES}" -name "feature-*.jar" -type f -exec basename {} \; 2> /dev/null) @@ -416,16 +414,7 @@ function enableDbAnalysis() echo "error: not existing configuration to contact the database" return 2 fi - - # check DB set up - - source "${POLICY_HOME}"/etc/profile.d/base.conf - - if [[ -z ${SQL_HOST} ]] || [[ -z ${SQL_USER} ]] || [[ -z ${SQL_PASSWORD} ]]; then - echo "error: database credentials do not exist" - return 3 - fi - + return 0 } @@ -471,7 +460,6 @@ function enableFeatureConfig() fi local featureName="$1" - local featureInstallConf=feature-"${featureName}".conf local featureConfigs featureConfigPath if [[ -z ${featureName} ]]; then @@ -483,10 +471,6 @@ function enableFeatureConfig() for featureConfigPath in ${featureConfigs}; do ln -s -f "${featureConfigPath}" "${CONFIG}/" done - - if [[ -f "${PROFILED}"/"${featureInstallConf}" ]]; then - ln -s -f "${PROFILED}"/"${featureInstallConf}" "${CONFIG}"/"${featureInstallConf}""${ENVIRONMENT_SUFFIX}" - fi } # ########################################################## @@ -628,7 +612,7 @@ function enableFeatureArtifacts() artifacts=$(ls "${FEATURES}"/"${featureName}"/"${FEATURE_ARTIFACTS}"/* 2> /dev/null) for artifactPath in ${artifacts}; do - deploy-artifact -f -a ${artifactPath} + deploy-artifact -f -a "${artifactPath}" done } @@ -816,7 +800,6 @@ function disableFeatureConfig() fi local featureName="$1" - local featureInstallConf=feature-"${featureName}".conf local featureConfigs featureConfigPath if [[ -z ${featureName} ]]; then @@ -829,8 +812,6 @@ function disableFeatureConfig() configFileName=$(basename "${featureConfigPath}") rm -f "${CONFIG}"/"${configFileName}" 2> /dev/null done - - rm -f "${CONFIG}"/"${featureInstallConf}""${ENVIRONMENT_SUFFIX}" 2> /dev/null } # ########################################################## diff --git a/policy-management/src/main/server/config/policy-engine.properties b/policy-management/src/main/server/config/policy-engine.properties index 58389151..f7ff5d71 100644 --- a/policy-management/src/main/server/config/policy-engine.properties +++ b/policy-management/src/main/server/config/policy-engine.properties @@ -22,35 +22,35 @@ # Configuration Channel Settings: PDPD_CONFIGURATION -dmaap.source.topics=${{PDPD_CONFIGURATION_TOPIC}} -dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${{PDPD_CONFIGURATION_SERVERS}} -dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiKey=${{PDPD_CONFIGURATION_API_KEY}} -dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret=${{PDPD_CONFIGURATION_API_SECRET}} -dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.consumerGroup=${{PDPD_CONFIGURATION_CONSUMER_GROUP}} -dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.consumerInstance=${{PDPD_CONFIGURATION_CONSUMER_INSTANCE}} +dmaap.source.topics=${env:PDPD_CONFIGURATION_TOPIC} +dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${env:PDPD_CONFIGURATION_SERVERS} +dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiKey=${env:PDPD_CONFIGURATION_API_KEY} +dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret=${env:PDPD_CONFIGURATION_API_SECRET} +dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.consumerGroup=${env:PDPD_CONFIGURATION_CONSUMER_GROUP} +dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.consumerInstance=${env:PDPD_CONFIGURATION_CONSUMER_INSTANCE} dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.managed=false dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.https=true -dmaap.sink.topics=${{PDPD_CONFIGURATION_TOPIC}} -dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${{PDPD_CONFIGURATION_SERVERS}} -dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiKey=${{PDPD_CONFIGURATION_API_KEY}} -dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret=${{PDPD_CONFIGURATION_API_SECRET}} -dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.partitionKey=${{PDPD_CONFIGURATION_PARTITION_KEY}} +dmaap.sink.topics=${env:PDPD_CONFIGURATION_TOPIC} +dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${env:PDPD_CONFIGURATION_SERVERS} +dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiKey=${env:PDPD_CONFIGURATION_API_KEY} +dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret=${env:PDPD_CONFIGURATION_API_SECRET} +dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.partitionKey=${env:PDPD_CONFIGURATION_PARTITION_KEY} dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.managed=false dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.https=true http.server.services=SECURED-CONFIG -http.server.services.SECURED-CONFIG.host=${{TELEMETRY_HOST}} +http.server.services.SECURED-CONFIG.host=${env:TELEMETRY_HOST} http.server.services.SECURED-CONFIG.port=9696 -http.server.services.SECURED-CONFIG.userName=${{TELEMETRY_USER}} -http.server.services.SECURED-CONFIG.password=${{TELEMETRY_PASSWORD}} +http.server.services.SECURED-CONFIG.userName=${env:TELEMETRY_USER} +http.server.services.SECURED-CONFIG.password=${env:TELEMETRY_PASSWORD} http.server.services.SECURED-CONFIG.restPackages=org.onap.policy.drools.server.restful http.server.services.SECURED-CONFIG.managed=false http.server.services.SECURED-CONFIG.swagger=true http.server.services.SECURED-CONFIG.https=true -http.server.services.SECURED-CONFIG.aaf=${{AAF}} +http.server.services.SECURED-CONFIG.aaf=${env:AAF} http.server.services.SECURED-CONFIG.serialization.provider=org.onap.policy.common.gson.JacksonHandler -aaf.namespace=${{AAF_NAMESPACE}} -aaf.root.permission=${{AAF_NAMESPACE}}.pdpd +aaf.namespace=${env:AAF_NAMESPACE} +aaf.root.permission=${env:AAF_NAMESPACE}.pdpd |