removed command-executor,it is part of dispatcher

[appc/deployment.git] / installation / appc / src / main / scripts / installFeatures.sh

diff --git a/installation/appc/src/main/scripts/installFeatures.sh b/installation/appc/src/main/scripts/installFeatures.sh
index 8371847..735123c 100644 (file)
--- a/installation/appc/src/main/scripts/installFeatures.sh
+++ b/installation/appc/src/main/scripts/installFeatures.sh
@@ -22,7 +22,7 @@
 ###
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-APPC_HOME=${APPC_HOME:-/opt/openecomp/appc}
+APPC_HOME=${APPC_HOME:-/opt/onap/appc}
 APPC_FEATURE_DIR=${APPC_FEATURE_DIR:-${APPC_HOME}/features}
 
 function featureInstall {
@@ -41,7 +41,6 @@ done
 
 APPC_FEATURES=" \
  appc-metric \
- appc-command-executor \
  appc-dmaap-adapter \
  appc-event-listener \
  appc-chef-adapter \
@@ -52,19 +51,31 @@ APPC_FEATURES=" \
  appc-provider \
  appc-dg-util \
  appc-dg-shared \
- appc-asdc-listener \
+ appc-sdc-listener \
  appc-oam \
  appc-iaas-adapter \
- appc-ansible-adapter"
+ appc-ansible-adapter \
+ appc-sequence-generator \
+ appc-config-generator \
+ appc-config-data-services \
+ appc-artifact-handler \
+ appc-config-adaptor \
+ appc-config-audit \
+ appc-config-encryption-tool \
+ appc-config-flow-controller \
+ appc-config-params \
+ appc-aai-client"
+
+# Temp fix to fix bouncycastle issue that is preventing netconf to work correctly
+apt-get -y install wget
+wget -P /opt/opendaylight/current/deploy https://www.bouncycastle.org/download/bcprov-jdk15on-158.jar
+wget -P /opt/opendaylight/current/deploy https://www.bouncycastle.org/download/bcprov-ext-jdk15on-158.jar
 
 echo "Enabling core APP-C features"
 featureInstall odl-netconf-connector-all
 featureInstall odl-restconf-noauth
 featureInstall odl-netconf-topology
 
-# When the karaf netconf feature gets installed, need to replace default password with OpenECOMP APP-C ODL Password
-sed -i 's/admin<\/password>/Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U<\/password>/' ${ODL_HOME}/etc/opendaylight/karaf/99-netconf-connector.xml
-
 echo "Installing APP-C Features"
 echo ""
 
@@ -76,4 +87,4 @@ do
   else
     echo "No installer found for feature ${feature}"
   fi
-done
\ No newline at end of file
+done