Merge "Update docker-compose file for son-handler"
diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json
index bd13327..8aaca05 100644
--- a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json
+++ b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json
@@ -10,6 +10,9 @@
"dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
"dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
"dmaap.security.enableDmaapCertAuth": "false",
+ "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
+ "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
+ "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
"sftp.security.strictHostKeyChecking": "true",
"streams_publishes": {
"PM_MEAS_FILES": {
@@ -27,7 +30,7 @@
"streams_subscribes": {
"dmaap_subscriber": {
"dmaap_info": {
- "topic_url":"http://dradmin:dradmin@dmaap-message-router:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
+ "topic_url":"http://dmaap-message-router:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
},
"type": "message_router"
}
diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml
index dff4824..46fab55 100644
--- a/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml
+++ b/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml
@@ -112,6 +112,7 @@
- dcaegen2-datafile-collector
environment:
KNOWN_HOSTS_FILE_PATH: "/home/datafile/.ssh/known_hosts"
+ CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
cbs-sim:
container_name: config-binding-service-sim
diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml b/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml
index f92d19f..2ea2882 100644
--- a/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml
+++ b/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml
@@ -21,5 +21,7 @@
CONSUL_HOST: "consul-server"
CONSUL_PORT: 8500
CONFIG_BINDING_SERVICE: "config-binding-service"
+ CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
HOSTNAME: "dfc_app0"
KNOWN_HOSTS_FILE_PATH: "/home/datafile/.ssh/known_hosts"
+
diff --git a/scripts/policy/docker-compose-drools.yml b/scripts/policy/docker-compose-drools.yml
index 974b465..5fc6ef6 100644
--- a/scripts/policy/docker-compose-drools.yml
+++ b/scripts/policy/docker-compose-drools.yml
@@ -32,9 +32,8 @@
- 8081
drools:
image: nexus3.onap.org:10001/onap/policy-drools:${POLICY_DROOLS_VERSION}
- user: 1000:1000
container_name: drools
- depends_on:
+ depends_on:
- mariadb
- nexus
hostname: drools