SDNC directory renamed to ccsdk based on latest ccsdk update.
Files startODL.sh and appc.properties updated based on Nitrogen ODL.
Change-Id: I096ffb211afdd7df7438f5bb276ecc6b0fbfc09d
Issue-ID: OOM-951
Signed-off-by: Aaron Hay <ah415j@att.com>
fi
echo "Installing Opendaylight cluster features"
- ${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-clustering
- ${ODL_HOME}/bin/client -u karaf feature:install odl-jolokia
+ ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering
+ ${ODL_HOME}/bin/client feature:install odl-jolokia
echo "Update cluster information statically"
hm=$(hostname)
}
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
+ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-admin}
+SDNC_HOME=${SDNC_HOME:-/opt/onap/ccsdk}
APPC_HOME=${APPC_HOME:-/opt/onap/appc}
SLEEP_TIME=${SLEEP_TIME:-120}
MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}}
ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
+appcInstallStartTime=$(date +%s)
+
#
# Adding the DMAAP_TOPIC_ENV variable into APPC-ASDC-LISTENER properties
#
then
echo "Installing SDNC database"
${SDNC_HOME}/bin/installSdncDb.sh
+
echo "Installing APPC database"
${APPC_HOME}/bin/installAppcDb.sh
+
echo "Starting OpenDaylight"
${ODL_HOME}/bin/start
+
echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
sleep ${SLEEP_TIME}
- echo "Inserting modified installFeatures.sh for sdnc"
- rm ${SDNC_HOME}/bin/installFeatures.sh
- cp ${APPC_HOME}/data/sdncInstallFeatures.sh ${SDNC_HOME}/bin/installFeatures.sh
+
+ echo "Copying a working version of the logging configuration into the opendaylight etc folder"
+ cp ${APPC_HOME}/data/org.ops4j.pax.logging.cfg ${ODL_HOME}/etc/org.ops4j.pax.logging.cfg
+ echo "Copying a new version of aaf cadi shiro into the opendaylight deploy folder"
+ cp ${APPC_HOME}/data/aaf-cadi-shiro.jar ${ODL_HOME}/deploy/aaf-cadi-shiro.jar
+
echo "Installing SDNC platform features"
${SDNC_HOME}/bin/installFeatures.sh
+
if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
then
echo "Installing directed graphs"
echo "Installing APPC platform features"
${APPC_HOME}/bin/installFeatures.sh
+
if [ -x ${APPC_HOME}/svclogic/bin/install.sh ]
then
echo "Installing APPC DGs using platform-logic"
if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
+ echo "Adding a property system.properties for AAF cadi.properties location"
+ echo "" >> ${ODL_HOME}/etc/system.properties
+ echo "cadi_prop_files=${APPC_HOME}/data/properties/cadi.properties" >> ${ODL_HOME}/etc/system.properties
+ echo "" >> ${ODL_HOME}/etc/system.properties
+
+ echo "Copying a working version of the shiro configuration into the opendaylight etc folder"
+ cp ${APPC_HOME}/data/shiro.ini ${ODL_HOME}/etc/shiro.ini
+
echo "Restarting OpenDaylight"
${ODL_HOME}/bin/stop
+ echo "Waiting 60 seconds for OpenDaylight stop to complete"
+ sleep 60
echo "Installed at `date`" > ${SDNC_HOME}/.installed
fi
+ appcInstallEndTime=$(date +%s)
+ echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"
+
exec ${ODL_HOME}/bin/karaf
appc.demo.threads.poolsize.min=1
appc.demo.threads.poolsize.max=2
appc.demo.provider.user=admin
-appc.demo.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+appc.demo.provider.pass=admin
appc.demo.provider.url=http://localhost:8181/restconf/operations/appc-provider
-appc.provider.vfodl.url=http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@appc-sdnhost.{{.Release.Namespace}}:8282/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/
+appc.provider.vfodl.url=http://admin:admin@appc-sdnhost.{{.Release.Namespace}}:8282/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/
# The properties right below are needed to properly call the Master DG to serve demo purposes
appc.service.logic.module.name=APPC
provider1.tenant1.name=default
provider1.tenant1.domain=default
provider1.tenant1.userid=admin
-provider1.tenant1.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+provider1.tenant1.password=admin
appc.LCM.topic.write=APPC-LCM-WRITE
appc.LCM.client.name=APPC-EVENT-LISTENER-TEST
appc.LCM.provider.user=admin
-appc.LCM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+appc.LCM.provider.pass=admin
appc.LCM.provider.url=http://localhost:8181/restconf/operations/appc-provider-lcm
# properties from appc-netconf-adapter-bundle, appc-dg-common, appc-dmaap-adapter-bundle
poolMembers=dmaap.{{.Release.Namespace}}:3904
event.pool.members=dmaap.{{.Release.Namespace}}:3904
restconf.user=admin
-restconf.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+restconf.pass=admin
# properties found in appc-rest-adapter-bundle, appc-chef-adapter-bundle, appc-iaas-adapter-bundle)
appc.OAM.topic.write=testOAM
appc.OAM.client.name=testOAM
appc.OAM.provider.user=admin
-appc.OAM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+appc.OAM.provider.pass=admin
name: {{ include "common.fullname" . }}-onap-sdnc-bin
namespace: {{ include "common.namespace" . }}
data:
-{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/bin/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/appc/opt/onap/ccsdk/bin/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
name: {{ include "common.fullname" . }}-onap-sdnc-data-properties
namespace: {{ include "common.namespace" . }}
data:
-{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/data/properties/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/appc/opt/onap/ccsdk/data/properties/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
name: {{ include "common.fullname" . }}-onap-sdnc-svclogic-bin
namespace: {{ include "common.namespace" . }}
data:
-{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/svclogic/bin/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/appc/opt/onap/ccsdk/svclogic/bin/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
name: {{ include "common.fullname" . }}-onap-sdnc-svclogic-config
namespace: {{ include "common.namespace" . }}
data:
-{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/svclogic/config/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/appc/opt/onap/ccsdk/svclogic/config/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
- mountPath: /opt/onap/appc/bin/installAppcDb.sh
name: onap-appc-bin
subPath: installAppcDb.sh
- - mountPath: /opt/onap/sdnc/data/properties/dblib.properties
+ - mountPath: /opt/onap/ccsdk/data/properties/dblib.properties
name: onap-sdnc-data-properties
subPath: dblib.properties
- - mountPath: /opt/onap/sdnc/data/properties/svclogic.properties
+ - mountPath: /opt/onap/ccsdk/data/properties/svclogic.properties
name: onap-sdnc-data-properties
subPath: svclogic.properties
- - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties
+ - mountPath: /opt/onap/ccsdk/data/properties/aaiclient.properties
name: onap-sdnc-data-properties
subPath: aaiclient.properties
- - mountPath: /opt/onap/sdnc/svclogic/config/svclogic.properties
+ - mountPath: /opt/onap/ccsdk/svclogic/config/svclogic.properties
name: onap-sdnc-svclogic-config
subPath: svclogic.properties
- - mountPath: /opt/onap/sdnc/svclogic/bin/showActiveGraphs.sh
+ - mountPath: /opt/onap/ccsdk/svclogic/bin/showActiveGraphs.sh
name: onap-sdnc-svclogic-bin
subPath: showActiveGraphs.sh
- - mountPath: /opt/onap/sdnc/bin/startODL.sh
+ - mountPath: /opt/onap/ccsdk/bin/startODL.sh
name: onap-sdnc-bin
subPath: startODL.sh
- - mountPath: /opt/onap/sdnc/bin/installSdncDb.sh
+ - mountPath: /opt/onap/ccsdk/bin/installSdncDb.sh
name: onap-sdnc-bin
subPath: installSdncDb.sh
- mountPath: /var/log/onap
Code Review / oom.git / commitdiff