diff options
4 files changed, 17 insertions, 8 deletions
diff --git a/installation/appc/src/main/scripts/installFeatures.sh b/installation/appc/src/main/scripts/installFeatures.sh index d26826c..33b96d9 100644 --- a/installation/appc/src/main/scripts/installFeatures.sh +++ b/installation/appc/src/main/scripts/installFeatures.sh @@ -57,9 +57,9 @@ done APPC_FEATURES_1=" \ onap-appc-core \ onap-appc-metric \ - onap-appc-dmaap-adapter \ onap-appc-chef-adapter \ onap-appc-netconf-adapter \ + onap-appc-service-communicator \ onap-appc-rest-adapter \ onap-appc-lifecycle-management \ onap-appc-license-manager" @@ -83,7 +83,6 @@ APPC_FEATURES_1=" \ APPC_FEATURES_3=" \ 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" @@ -91,8 +90,6 @@ APPC_FEATURES_1=" \ APPC_FEATURES_UNZIP=" \ appc-core \ appc-metric \ - appc-dmaap-adapter \ - appc-event-listener \ appc-chef-adapter \ appc-netconf-adapter \ appc-rest-adapter \ @@ -117,7 +114,8 @@ APPC_FEATURES_1=" \ appc-aai-client \ appc-network-inventory-client \ appc-design-services \ - appc-interfaces-service" + appc-interfaces-service \ + appc-service-communicator" diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh index daf2b9a..4b826ec 100644 --- a/installation/appc/src/main/scripts/installZips.sh +++ b/installation/appc/src/main/scripts/installZips.sh @@ -46,12 +46,10 @@ APPC_FEATURES=" \ appc-sdc-listener \ appc-lifecycle-management \ appc-provider \ - appc-event-listener \ appc-dispatcher \ appc-chef-adapter \ appc-netconf-adapter \ appc-rest-adapter \ - appc-dmaap-adapter \ appc-dg-util \ appc-metric \ appc-dg-shared \ @@ -70,7 +68,8 @@ APPC_FEATURES=" \ appc-aai-client \ appc-network-inventory-client \ appc-design-services \ - appc-interfaces-service" + appc-interfaces-service \ + appc-service-communicator" APPC_VERSION=${APPC_VERSION:-0.0.1} @@ -131,6 +130,10 @@ echo "Downloading CDT Proxy Jar from nexus" mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.cdt:cdt-proxy-service:${APPC_CDT_VERSION} -DoutputDirectory=${targetDir}/cdt-proxy-service mv ${targetDir}/cdt-proxy-service/cdt-proxy-service-*.jar ${targetDir}/cdt-proxy-service/cdt-proxy-service.jar +echo "Downloading Dmaap Service Jar from nexus" +mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.services.dmaap:dmaap-event-service:1.7.0-SNAPSHOT -DoutputDirectory=${targetDir}/dmaap-event-service +mv ${targetDir}/dmaap-event-service/dmaap-event-service-*.jar ${targetDir}/dmaap-event-service/dmaap-event-service.jar + find ${targetDir} -name '*.sh' -exec chmod +x '{}' \; cd $cwd diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh index f76c887..1d33eb4 100644 --- a/installation/appc/src/main/scripts/startODL.sh +++ b/installation/appc/src/main/scripts/startODL.sh @@ -86,6 +86,9 @@ fi echo "Starting cdt-proxy-service jar, logging to ${APPC_HOME}/cdt-proxy-service/jar.log" java -jar ${APPC_HOME}/cdt-proxy-service/cdt-proxy-service.jar > ${APPC_HOME}/cdt-proxy-service/jar.log & +echo "Starting dmaap-event-service jar, logging to ${APPC_HOME}/dmaap-event-service/jar.log" +java -jar -Dorg_onap_appc_bootstrap_path=/opt/onap/appc/data/properties -Dorg_onap_appc_bootstrap_file=appc.properties ${APPC_HOME}/dmaap-event-service/dmaap-event-service.jar > ${APPC_HOME}/dmaap-event-service/jar.log & + echo "Starting ODL/APPC" #echo "Copying the aaa shiro configuration into opendaylight" diff --git a/installation/src/main/properties/appc.properties b/installation/src/main/properties/appc.properties index 0ffe850..3a0695c 100644 --- a/installation/src/main/properties/appc.properties +++ b/installation/src/main/properties/appc.properties @@ -134,3 +134,8 @@ appc.OAM.topic.write=testOAM appc.OAM.client.name=testOAM appc.OAM.provider.user=admin appc.OAM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + +#Properties for communication between appc dmaap microservice and appc +appc.srvcomm.messaging.username=appc +appc.srvcomm.messaging.password=onapappc +appc.srvcomm.messaging.url=http://localhost:8080/publish |