Merge "Release v2.5.1 maven artifacts"

diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml
index 6b8d464..cb44a7f 100644 (file)
--- a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml
+++ b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml
@@ -21,8 +21,14 @@ services:
       - SDNRONLY=true
       - JAVA_OPTS=-Xms256m -Xmx2g
       - SDNR_WEBSOCKET_PORT=${SDNR_WEBSOCKET_PORT}
+      - SDNR_KAFKA_ENABLED=true
+      - SDNR_KAFKA_BOOTSTRAP_SERVERS=kafka:9092
+      - SDNR_KAFKA_SECURITY_PROTOCOL=PLAINTEXT
+      - SDNR_KAFKA_SASL_MECHANISM=PLAIN
+      - SDNR_KAFKA_SASL_JAAS_CONFIG=PLAIN
+      - SDNRUSERNAME=${ODL_ADMIN_USERNAME}
+      - SDNRPASSWORD=${ODL_ADMIN_PASSWORD}
     volumes:
-      - ./sdnr/mountpoint-registrar.properties:/opt/opendaylight/etc/mountpoint-registrar.properties
       - ./sdnr/certs/certs.properties:${ODL_CERT_DIR}/certs.properties
       - ./sdnr/certs/keys0.zip:${ODL_CERT_DIR}/keys0.zip
     networks:

diff --git a/csit/scripts/sdnr/docker-compose/sdnr/mountpoint-registrar.properties b/csit/scripts/sdnr/docker-compose/sdnr/mountpoint-registrar.properties
deleted file mode 100644 (file)
index 87802fb..0000000
--- a/csit/scripts/sdnr/docker-compose/sdnr/mountpoint-registrar.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-[general]
-baseUrl=http://localhost:8181
-sdnrUser=admin
-sdnrPasswd=${ODL_ADMIN_PASSWORD}
-
-[strimzi-kafka]
-strimziEnabled=true
-bootstrapServers=kafka:9092
-securityProtocol=PLAINTEXT
-saslMechanism=PLAIN
-saslJaasConfig=PLAIN
-
-
-[fault]
-topic=unauthenticated.SEC_FAULT_OUTPUT
-consumerGroup=myG
-consumerID=C1
-timeout=20000
-limit=10000
-fetchPause=5000
-
-[provisioning]
-topic=unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT
-consumerGroup=myG
-consumerID=C1
-timeout=20000
-limit=10000
-fetchPause=5000
-
-[pnfRegistration]
-topic=unauthenticated.VES_PNFREG_OUTPUT
-consumerGroup=myG
-consumerID=C1
-timeout=20000
-limit=10000
-fetchPause=5000
-
-[stndDefinedFault]
-topic=unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT
-consumerGroup=myG
-consumerID=C1
-timeout=20000
-limit=10000
-fetchPause=5000