From d38b89bd965a703ff4070f47956a5aba249c3415 Mon Sep 17 00:00:00 2001
From: Jorge Hernandez <jh1730@att.com>
Date: Thu, 3 May 2018 14:08:42 -0500
Subject: install controlloop drools applications

it will get the proper control loop application  on the fly
to minimize space used in configmaps.

upgrades mariadb to latest stable version (previous one
used by policy was outdated).

fixes pessimistic lock DB problems on PE side

fixes outdated policy-keystore overriding the image one

Change-Id: Ia78d23b57b4e314c44c97912d544b85d0d6c9c5e
Issue-ID: POLICY-766
Signed-off-by: Jorge Hernandez <jh1730@att.com>
---
 .../opt/policy/config/drools/drools-preinstall.sh  | 52 ++++++++++++++++++++++
 .../charts/drools/resources/scripts/do-start.sh    | 50 ---------------------
 2 files changed, 52 insertions(+), 50 deletions(-)
 create mode 100644 kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-preinstall.sh
 delete mode 100644 kubernetes/policy/charts/drools/resources/scripts/do-start.sh

(limited to 'kubernetes/policy/charts/drools/resources')

diff --git a/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-preinstall.sh b/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-preinstall.sh
new file mode 100644
index 0000000000..8b290128b3
--- /dev/null
+++ b/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-preinstall.sh
@@ -0,0 +1,52 @@
+#!/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=========================================================
+#
+
+# #################################
+# Usage
+# #################################
+
+function usage {
+    echo
+    echo "Usage: $(basename $0)"
+    echo
+}
+
+if [[ ${DEBUG} == y ]]; then
+    set -x
+fi
+
+if [[ -z ${BUILD_VERSION} ]]; then
+    echo "no BUILD_VERSION available as environment variable""
+    usage
+    exit 1
+fi
+
+if [[ -z ${POLICY_INSTALL} ]]; then
+    echo "no POLICY_INSTALL available as environment variable""
+    usage
+    exit 2
+fi
+
+CONFIG_DIR=$(dirname "$0")
+echo "invoking ${CONFIG_DIR}/apps-install.sh for controlloop ${BUILD_VERSION} at ${POLICY_INSTALL}"
+export DEBUG=y
+bash ${CONFIG_DIR}/apps-install.sh controlloop ${BUILD_VERSION} ${POLICY_INSTALL}
+unzip -o ${POLICY_INSTALL}/app*.zip -d ${POLICY_INSTALL}
diff --git a/kubernetes/policy/charts/drools/resources/scripts/do-start.sh b/kubernetes/policy/charts/drools/resources/scripts/do-start.sh
deleted file mode 100644
index 1c40e11b16..0000000000
--- a/kubernetes/policy/charts/drools/resources/scripts/do-start.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada, AT&T
-#
-# 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.
-
-#!/bin/bash
-
-# skip installation if build.info file is present (restarting an existing container)
-if [[ -f /opt/app/policy/etc/build.info ]]; then
-	echo "Found existing installation, will not reinstall"
-	. /opt/app/policy/etc/profile.d/env.sh
-else 
-	# replace conf files from installer with environment-specific files
-	# mounted from the hosting VM
-	if [[ -d config ]]; then
-		cp config/*.conf .
-	fi
-
-	./docker-install.sh
-
-	. /opt/app/policy/etc/profile.d/env.sh
-
-	# install policy keystore
-	mkdir -p $POLICY_HOME/etc/ssl
-	cp config/policy-keystore $POLICY_HOME/etc/ssl
-
-	if [[ -x config/drools-tweaks.sh ]] ; then
-		echo "Executing tweaks"
-		# file may not be executable; running it as an
-		# argument to bash avoids needing execute perms.
-		bash config/drools-tweaks.sh
-	fi
-
-	# sql provisioning scripts should be invoked here.
-fi
-
-echo "Starting processes"
-
-policy start
-
-sleep 1000d
-- 
cgit 1.2.3-korg