diff options
| author |   Ravi Pendurty <ravi.pendurty@highstreet-technologies.com> | 2023-04-21 17:35:45 +0530 |
|---|---|---|
| committer | Ravi Pendurty <ravi.pendurty@highstreet-technologies.com> | 2023-04-21 17:36:14 +0530 |
| commit | f8c83e7bdfa30fb67eaa9a0334827065190d74bf (patch) | |
| tree | d95e163e98a26f5416535b36b98c7084409b6f87 | |
| parent | 35bc08cfc2792d1fa1ce5d4cf8cf940251163711 (diff) | |
Use env vars for strimzi kafka configuration
remove static mountpoint-registrar.properties file and use docker-compose instead for configuration
Issue-ID: SDNC-1797
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: I317ae2024910aeaf01c91306a956421388805490
Former-commit-id: 2275f4b93a950c9bb9873a0d3e698573bfa75e9a
| -rw-r--r-- | csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml | 8 | ||||
| -rw-r--r-- | csit/scripts/sdnr/docker-compose/sdnr/mountpoint-registrar.properties | 44 |
2 files changed, 7 insertions, 45 deletions
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 6b8d4648..cb44a7f0 100644 --- 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 index 87802fb0..00000000 --- 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 |