From e86e05b78cf444e4020ffd310b9519730891e128 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 20 Sep 2017 15:11:18 -0400 Subject: Fix platform logic installation Platform logic on SDNC should install the CCSDK platform logic package merged with the graphs for SDNC. Instead, it was overwriting CCSDK package and installing only local SDNC version. Change-Id: Iada6779b942ff608987486bd10fed9f147018f74 Issue-ID: SDNC-96 Signed-off-by: Dan Timoney Former-commit-id: 048b31a4b390ff4a749c4d8e7dcd271f12da177e --- .../installer/src/main/scripts/setenv.sh | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 platform-logic/installer/src/main/scripts/setenv.sh (limited to 'platform-logic/installer/src/main/scripts/setenv.sh') diff --git a/platform-logic/installer/src/main/scripts/setenv.sh b/platform-logic/installer/src/main/scripts/setenv.sh deleted file mode 100644 index 08792bca..00000000 --- a/platform-logic/installer/src/main/scripts/setenv.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 2017 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========================================================= -### - -SDNC_CONFIG_DIR=${SDNC_CONFIG_DIR:-/opt/sdnc/data/properties} - -AAIURI=$(grep org.openecomp.sdnc.sli.aai.uri ${SDNC_CONFIG_DIR}/aaiclient.properties | grep -v '#' | cut -d'=' -f2) - -MYSQL_USER=$(grep org.openecomp.sdnc.sli.jdbc.user ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) -MYSQL_PWD=$(grep org.openecomp.sdnc.sli.jdbc.password ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) -MYSQL_DB=$(grep org.openecomp.sdnc.sli.jdbc.database ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) -MYSQL_SERVER=$(grep org.openecomp.sdnc.sli.jdbc.hosts ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2 | cut -d',' -f1) - -ODLUSER=$(grep controllerUser ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2) -ODLPWD=$(grep controllerPass ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2) - -ODLHOST=$(grep odlNodes ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2|cut -d',' -f1) -ODLPORT=$(grep controllerPort ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2) -if [ $ODLPORT = 8443 ] -then - ODLPROTO=https -else - ODLPROTO=http -fi - -unset HTTP_PROXY HTTPS_PROXY http_proxy https_proxy -- cgit 1.2.3-korg