aboutsummaryrefslogtreecommitdiffstats
path: root/policy-management/src
diff options
context:
space:
mode:
Diffstat (limited to 'policy-management/src')
-rw-r--r--policy-management/src/main/server-gen/bin/db-migrator4
-rw-r--r--policy-management/src/main/server-gen/bin/features7
2 files changed, 5 insertions, 6 deletions
diff --git a/policy-management/src/main/server-gen/bin/db-migrator b/policy-management/src/main/server-gen/bin/db-migrator
index 10240052..29a50d42 100644
--- a/policy-management/src/main/server-gen/bin/db-migrator
+++ b/policy-management/src/main/server-gen/bin/db-migrator
@@ -3,7 +3,7 @@
# ============LICENSE_START=======================================================
# ONAP
# ================================================================================
-# Copyright (C) 2017 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.
@@ -520,7 +520,7 @@ if [[ -z ${SCHEMA} ]]; then
exit 2
fi
-source "${POLICY_HOME}"/etc/profile.d/base.conf
+source "${POLICY_HOME}"/etc/profile.d/env.sh
if [[ -z ${SQL_HOST} ]] || [[ -z ${SQL_USER} ]] || [[ -z ${SQL_PASSWORD} ]]; then
echo "error: no database has been set up"
diff --git a/policy-management/src/main/server-gen/bin/features b/policy-management/src/main/server-gen/bin/features
index 861806aa..d9c6eb28 100644
--- a/policy-management/src/main/server-gen/bin/features
+++ b/policy-management/src/main/server-gen/bin/features
@@ -409,10 +409,9 @@ function enableDbAnalysis()
return 0
fi
- source "${POLICY_HOME}"/etc/profile.d/base.conf
+ source "${POLICY_HOME}"/etc/profile.d/env.sh
if [[ -z ${SQL_HOST} ]] || [[ -z ${SQL_USER} ]] || [[ -z ${SQL_PASSWORD} ]]; then
- echo "error: not existing configuration to contact the database"
- return 2
+ echo "warning: DB server is not configured"
fi
return 0
@@ -1086,7 +1085,7 @@ function installFeatures
echo "feature ${name} has been installed (no configuration present)"
fi
- customOpScript "${featureName}" "install"
+ customOpScript "${name}" "install"
done
# check the current directory and the 'config' directory for a