From 30cf6d7f7d77f1e83a84bfea8e991ca867c9a96c Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Wed, 6 Mar 2019 23:31:48 -0600 Subject: Tweaking scripts to install for pdpd-cl image Change-Id: I5f7ab5de402a5412938f42ae76e21f112b106b3a Issue-ID: POLICY-1560 Signed-off-by: Jorge Hernandez --- policy-management/src/main/server-gen/bin/db-migrator | 4 ++-- policy-management/src/main/server-gen/bin/features | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'policy-management') 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 -- cgit 1.2.3-korg