diff options
3 files changed, 54 insertions, 2 deletions
diff --git a/feature-distributed-locking/src/main/feature/install/disable b/feature-distributed-locking/src/main/feature/install/disable new file mode 100644 index 00000000..ef05dbdc --- /dev/null +++ b/feature-distributed-locking/src/main/feature/install/disable @@ -0,0 +1,26 @@ +#! /bin/bash + +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2018 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. +# 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. +# ============LICENSE_END========================================================= + +if [[ "${DEBUG}" == "y" ]]; then + set -x +fi + +${POLICY_HOME}/bin/db-migrator -s pooling -o downgrade + diff --git a/feature-distributed-locking/src/main/feature/install/enable b/feature-distributed-locking/src/main/feature/install/enable new file mode 100644 index 00000000..083433b6 --- /dev/null +++ b/feature-distributed-locking/src/main/feature/install/enable @@ -0,0 +1,26 @@ +#! /bin/bash + +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2018 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. +# 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. +# ============LICENSE_END========================================================= + +if [[ "${DEBUG}" == "y" ]]; then + set -x +fi + +${POLICY_HOME}/bin/db-migrator -s pooling -o upgrade + diff --git a/policy-management/src/main/server-gen/bin/features b/policy-management/src/main/server-gen/bin/features index 9f139f8b..13621aa4 100644 --- a/policy-management/src/main/server-gen/bin/features +++ b/policy-management/src/main/server-gen/bin/features @@ -332,8 +332,8 @@ function enableConfigAnalysis () featureConfigs=$(ls "${FEATURES}"/"${featureName}"/"${FEATURE_CONFIG}"/ 2> /dev/null) for configPath in ${featureConfigs}; do configFileName=$(basename "${configPath}") - if [[ -e "${LIB}"/"${configFileName}" ]]; then - echo "error: a config file of the same name is already in the base: ${configFileName}" + if [[ -e "${CONFIG}"/"${configFileName}" ]]; then + echo "error: a config file of the same name is already in the base installation: ${configFileName}" return 2 fi done |