aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaka Cho <takamune.cho@att.com>2019-06-25 15:02:52 -0400
committerTaka Cho <takamune.cho@att.com>2019-06-25 15:05:30 -0400
commitbd63178c1c0eabafe55ac8c23b16cf73552360ce (patch)
treeae7aff3f3f5ad1dc1b68520d227341d2eed7e1be
parent31eb245f1251fa77d2b1fd51a7fea96f428bf7bf (diff)
remove unused feature and scripts
installFeatures.sh moved to docker build time. startODL.sh under ccsdk/bin was the old startup script. odl-mdsal-clustering moved to docker build time. Issue-ID: APPC-1631 Change-Id: Ief332ef029f28f8c37a5121fd78a17b88c61bd6f Signed-off-by: Taka Cho <takamune.cho@att.com>
-rwxr-xr-xkubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh184
-rwxr-xr-xkubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh3
-rwxr-xr-xkubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh68
-rw-r--r--kubernetes/appc/templates/statefulset.yaml6
4 files changed, 1 insertions, 260 deletions
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh
deleted file mode 100755
index 724f4e767d..0000000000
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# APPC
-# ================================================================================
-# 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=========================================================
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-###
-
-ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-APPC_HOME=${APPC_HOME:-/opt/onap/appc}
-ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
-APPC_FEATURE_DIR=${APPC_FEATURE_DIR:-${APPC_HOME}/features}
-
-function featureInstall {
-COUNT=0
-while [ $COUNT -lt 10 ]; do
- ${ODL_HOME}/bin/client feature:install $1 2> /tmp/installErr
- cat /tmp/installErr
- if grep -q 'Failed to get the session' /tmp/installErr; then
- sleep 10
- else
- let COUNT=10
- fi
- let COUNT=COUNT+1
-done
-}
-
- APPC_FEATURES=" \
- appc-metric \
- appc-dmaap-adapter \
- appc-chef-adapter \
- appc-netconf-adapter \
- appc-rest-adapter \
- appc-lifecycle-management \
- appc-dispatcher \
- appc-provider \
- appc-dg-util \
- appc-dg-shared \
- appc-sdc-listener \
- appc-oam \
- appc-iaas-adapter \
- appc-ansible-adapter \
- appc-sequence-generator \
- appc-artifact-handler \
- appc-aai-client"
-
-APPC_FEATURES_1=" \
- onap-appc-core \
- onap-appc-metric \
- onap-appc-dmaap-adapter \
- onap-appc-chef-adapter \
- onap-appc-netconf-adapter \
- onap-appc-rest-adapter \
- onap-appc-lifecycle-management \
- onap-appc-license-manager"
-
- APPC_FEATURES_2=" \
- onap-appc-dg-util \
- onap-appc-dg-shared \
- onap-appc-sdc-listener \
- onap-appc-oam \
- onap-appc-iaas-adapter \
- onap-appc-ansible-adapter \
- onap-appc-sequence-generator \
- onap-appc-config-generator \
- onap-appc-config-data-services \
- onap-appc-config-adaptor \
- onap-appc-config-audit \
- onap-appc-config-encryption-tool \
- onap-appc-config-flow-controller \
- onap-appc-config-params \
- onap-appc-artifact-handler
- onap-appc-aai-client \
- onap-appc-event-listener \
- onap-appc-network-inventory-client \
- onap-appc-design-services \
- onap-appc-interfaces-service"
-
- APPC_FEATURES_UNZIP=" \
- appc-core \
- appc-metric \
- appc-dmaap-adapter \
- appc-event-listener \
- appc-chef-adapter \
- appc-netconf-adapter \
- appc-rest-adapter \
- appc-lifecycle-management \
- appc-dispatcher \
- appc-provider \
- appc-dg-util \
- appc-dg-shared \
- appc-sdc-listener \
- appc-oam \
- appc-iaas-adapter \
- appc-ansible-adapter \
- appc-sequence-generator \
- appc-config-generator \
- appc-config-data-services \
- appc-config-adaptor \
- appc-config-audit \
- appc-config-encryption-tool \
- appc-config-flow-controller \
- appc-config-params \
- appc-artifact-handler \
- appc-aai-client \
- appc-network-inventory-client \
- appc-design-services \
- appc-interfaces-service"
-
-
-if $ENABLE_ODL_CLUSTER
- then
- echo "Enabling core APP-C features with clustering enabled"
- featureInstall odl-netconf-connector-all
- featureInstall odl-restconf-noauth
- featureInstall odl-netconf-clustered-topology
- else
- echo "Enabling core APP-C features with clustering disabled"
- featureInstall odl-netconf-connector-all
- featureInstall odl-restconf-noauth
- featureInstall odl-netconf-topology
-fi
-
-sleep 7s
-echo "Installing APP-C Features"
-echo ""
-
-for feature in ${APPC_FEATURES_UNZIP}
-do
- if [ -f ${APPC_FEATURE_DIR}/${feature}/install-feature.sh ]
- then
- ${APPC_FEATURE_DIR}/${feature}/install-feature.sh
- else
- echo "No installer found for feature ${feature}"
- fi
-done
-
-#${ODL_HOME}/bin/client feature:install appc-metric appc-dmaap-adapter appc-event-listener appc-chef-adapter appc-netconf-adapter appc-rest-adapter appc-lifecycle-management appc-dispatcher appc-provider appc-dg-util appc-dg-shared appc-sdc-listener appc-oam appc-iaas-adapter appc-ansible-adapter appc-sequence-generator appc-config-generator appc-config-data-services appc-config-adaptor appc-config-audit appc-config-encryption-tool appc-config-flow-controller appc-config-params appc-artifact-handler appc-aai-client
-
-for feature in ${APPC_FEATURES_1}
-do
- echo "Installing ${feature}"
- start=$(date +%s)
- ${ODL_HOME}/bin/client "feature:install -r ${feature}"
- end=$(date +%s)
- echo "Install of ${feature} took $(expr $end - $start) seconds"
- sleep 7s
- echo "Sleep Finished"
-done
-
- echo "Installing dispatcher features"
- start=$(date +%s)
- ${ODL_HOME}/bin/client "feature:install -r onap-appc-request-handler onap-appc-command-executor onap-appc-lifecycle-management onap-appc-workflow-management lock-manager onap-appc-provider"
- end=$(date +%s)
- echo "Install of dispatcher features took $(expr $end - $start) seconds"
- sleep 7s
- echo "Sleep Finished"
-
-for feature in ${APPC_FEATURES_2}
-do
- echo "Installing ${feature}"
- start=$(date +%s)
- ${ODL_HOME}/bin/client "feature:install -r ${feature}"
- end=$(date +%s)
- echo "Install of ${feature} took $(expr $end - $start) seconds"
- sleep 7s
- echo "Sleep Finished"
-done
-
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
index ed35de8f77..ad135f863a 100755
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
+++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
@@ -132,8 +132,7 @@ then
if $ENABLE_ODL_CLUSTER
then
- echo "Installing Opendaylight cluster features"
- ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering
+ echo "Enabling Opendaylight cluster features"
enable_odl_cluster
fi
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh
deleted file mode 100755
index 231fd0a24e..0000000000
--- a/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights
-# reserved.
-# Modifications Copyright © 2018 Amdocs,Bell Canada
-# ================================================================================
-# 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=========================================================
-###
-
-
-# Install SDN-C platform components if not already installed and start container
-
-ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
-SLEEP_TIME=${SLEEP_TIME:-120}
-MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.mariadbRootPassword}}}
-
-#
-# Wait for database
-#
-echo "Waiting for mariadbgalera"
-until mysql -h {{.Values.config.mariadbGaleraSVCName}}.{{.Release.Namespace}} -u root -p{{.Values.config.mariadbRootPassword}} mysql &> /dev/null
-do
- printf "."
- sleep 1
-done
-echo -e "\nmariadbgalera ready"
-
-if [ ! -f ${SDNC_HOME}/.installed ]
-then
- echo "Installing SDN-C database"
- ${SDNC_HOME}/bin/installSdncDb.sh
- echo "Starting OpenDaylight"
- ${ODL_HOME}/bin/start
- echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
- sleep ${SLEEP_TIME}
- echo "Installing SDN-C platform features"
- ${SDNC_HOME}/bin/installFeatures.sh
- if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
- then
- echo "Installing directed graphs"
- ${SDNC_HOME}/svclogic/bin/install.sh
- fi
-
-
- echo "Restarting OpenDaylight"
- ${ODL_HOME}/bin/stop
- echo "Installed at `date`" > ${SDNC_HOME}/.installed
-fi
-
-exec ${ODL_HOME}/bin/karaf
-
diff --git a/kubernetes/appc/templates/statefulset.yaml b/kubernetes/appc/templates/statefulset.yaml
index 4965cb1d9a..4fded9aa24 100644
--- a/kubernetes/appc/templates/statefulset.yaml
+++ b/kubernetes/appc/templates/statefulset.yaml
@@ -120,9 +120,6 @@ spec:
- mountPath: /opt/onap/appc/bin/installAppcDb.sh
name: onap-appc-bin
subPath: installAppcDb.sh
- - mountPath: /opt/onap/appc/bin/installFeatures.sh
- name: onap-appc-bin
- subPath: installFeatures.sh
- mountPath: /opt/onap/appc/bin/health_check.sh
name: onap-appc-bin
subPath: health_check.sh
@@ -141,9 +138,6 @@ spec:
- mountPath: /opt/onap/ccsdk/svclogic/bin/showActiveGraphs.sh
name: onap-sdnc-svclogic-bin
subPath: showActiveGraphs.sh
- - mountPath: /opt/onap/ccsdk/bin/startODL.sh
- name: onap-sdnc-bin
- subPath: startODL.sh
- mountPath: /opt/onap/ccsdk/bin/installSdncDb.sh
name: onap-sdnc-bin
subPath: installSdncDb.sh