diff options
author | adheli.tavares <adheli.tavares@est.tech> | 2024-01-26 15:28:56 +0000 |
---|---|---|
committer | Adheli Tavares <adheli.tavares@est.tech> | 2024-02-09 10:31:15 +0000 |
commit | cc1d3d352771d1fa35d297e90663539e34b022f6 (patch) | |
tree | b1b00d678b0157742b91be1262fbf614a62063b1 /packages | |
parent | cce79248655f484e007769ba81b092148f940d27 (diff) |
Removing deprecated DMAAP library
Issue-ID: POLICY-4402
Change-Id: I4ce5b303cb3a775010683d3c7102b0bd065280ea
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
Diffstat (limited to 'packages')
-rw-r--r-- | packages/docker/src/main/docker/pdpd-entrypoint.sh | 8 | ||||
-rw-r--r-- | packages/install/pom.xml | 4 | ||||
-rw-r--r-- | packages/install/src/files/base.conf | 17 | ||||
-rw-r--r-- | packages/install/src/files/feature-pooling-messages.conf (renamed from packages/install/src/files/feature-pooling-dmaap.conf) | 0 |
4 files changed, 9 insertions, 20 deletions
diff --git a/packages/docker/src/main/docker/pdpd-entrypoint.sh b/packages/docker/src/main/docker/pdpd-entrypoint.sh index 112d3cb4..2caca628 100644 --- a/packages/docker/src/main/docker/pdpd-entrypoint.sh +++ b/packages/docker/src/main/docker/pdpd-entrypoint.sh @@ -2,6 +2,7 @@ # ######################################################################## # Copyright 2019-2021 AT&T Intellectual Property. All rights reserved +# Modifications Copyright (C) 2024 Nordix Foundation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -117,13 +118,6 @@ function security { cp -f "${POLICY_INSTALL_INIT}"/policy-truststore "${POLICY_HOME}"/etc/ssl fi fi - - if [ -f "${POLICY_INSTALL_INIT}"/aaf-cadi.keyfile ]; then - if ! cmp -s "${POLICY_INSTALL_INIT}"/aaf-cadi.keyfile "${POLICY_HOME}"/config/aaf-cadi.keyfile; then - echo "overriding aaf-cadi.keyfile" - cp -f "${POLICY_INSTALL_INIT}"/aaf-cadi.keyfile "${POLICY_HOME}"/config/aaf-cadi.keyfile - fi - fi } function serverConfig { diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 45f15b72..a79aa0ee 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -4,6 +4,7 @@ ================================================================================ Copyright (C) 2017, 2022 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2020 Bell Canada. + Modifications Copyright (C) 2024 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -40,6 +41,7 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> @@ -93,7 +95,7 @@ </dependency> <dependency> <groupId>org.onap.policy.drools-pdp</groupId> - <artifactId>feature-pooling-dmaap</artifactId> + <artifactId>feature-pooling-messages</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf index 24d95a76..3b447647 100644 --- a/packages/install/src/files/base.conf +++ b/packages/install/src/files/base.conf @@ -4,7 +4,7 @@ # ================================================================================ # Copyright (C) 2017-2022 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2020 Bell Canada. -# Modifications Copyright (C) 2022 Nordix Foundation. +# Modifications Copyright (C) 2022, 2024 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -87,13 +87,6 @@ JDBC_URL= # add optional JDBC options for the connector to use JDBC_OPTS= -# AAF - -AAF=false -AAF_NAMESPACE=org.onap.policy -AAF_HOST=aaf-onap-test.osaaf.org -CADI_KEYFILE=/opt/app/policy/config/aaf-cadi.keyfile - # Prometheus PROMETHEUS=false @@ -102,7 +95,7 @@ PROMETHEUS=false HTTP_SERVER_HTTPS=false -# PDP-D DMaaP configuration channel +# PDP-D Message Broker configuration channel PDPD_CONFIGURATION_TOPIC=PDPD-CONFIGURATION PDPD_CONFIGURATION_API_KEY= @@ -139,7 +132,7 @@ PDP_CLIENT_USERNAME= PDP_CLIENT_PASSWORD= PDP_ENVIRONMENT= -# DCAE DMaaP +# DCAE Message Broker DCAE_TOPIC= DCAE_SERVERS= @@ -147,8 +140,8 @@ DCAE_CONSUMER_GROUP= # Open DMaaP -DMAAP_SERVERS= -DMAAP_HTTPS=true +# DMAAP_SERVERS= +# DMAAP_HTTPS=true # AAI diff --git a/packages/install/src/files/feature-pooling-dmaap.conf b/packages/install/src/files/feature-pooling-messages.conf index 0ef81951..0ef81951 100644 --- a/packages/install/src/files/feature-pooling-dmaap.conf +++ b/packages/install/src/files/feature-pooling-messages.conf |