From 2ef334e5fa431755c7c2c90c147edd101f2b8aaa Mon Sep 17 00:00:00 2001 From: Sirisha_Manchikanti Date: Tue, 7 Sep 2021 11:14:32 +0100 Subject: Remove DCAE participant and its references DCAE interactions are handled by k8s-participant from Istanbul due to the helm migration of DCAE services. Cloudify manager is no longer used in DCAE. Issue-ID: POLICY-3630 Signed-off-by: Sirisha_Manchikanti Change-Id: Ifc4cb2491d10cbb57c2e886480f4df7a691f2166 --- packages/policy-clamp-docker/pom.xml | 37 ------------- .../src/main/docker/DcaeParticipantDockerfile | 51 ----------------- .../src/main/docker/dcae-participant.sh | 64 ---------------------- packages/policy-clamp-tarball/pom.xml | 5 -- .../resources/etc/DcaeParticipantParameters.yaml | 55 ------------------- 5 files changed, 212 deletions(-) delete mode 100644 packages/policy-clamp-docker/src/main/docker/DcaeParticipantDockerfile delete mode 100644 packages/policy-clamp-docker/src/main/docker/dcae-participant.sh delete mode 100644 packages/policy-clamp-tarball/src/main/resources/etc/DcaeParticipantParameters.yaml (limited to 'packages') diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml index 90e88c941..4b848636d 100644 --- a/packages/policy-clamp-docker/pom.xml +++ b/packages/policy-clamp-docker/pom.xml @@ -186,38 +186,6 @@ - - onap/dcae-participant - onap-dcae-participant - - try - DcaeParticipantDockerfile - - ${project.version} - ${project.version}-${maven.build.timestamp} - ${project.docker.latest.minmax.tag.version} - - - - - - - org.onap.policy.clamp:policy-clamp-tarball - - /lib - dcae-participant.tar.gz - - - - org.onap.policy.clamp.participant:policy-clamp-participant-impl-dcae - - app.jar - - - - - - onap/http-participant onap-http-participant @@ -310,11 +278,6 @@ policy-clamp-participant-impl-policy ${project.version} - - org.onap.policy.clamp.participant - policy-clamp-participant-impl-dcae - ${project.version} - org.onap.policy.clamp.participant policy-clamp-participant-impl-kubernetes diff --git a/packages/policy-clamp-docker/src/main/docker/DcaeParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/DcaeParticipantDockerfile deleted file mode 100644 index 876f94687..000000000 --- a/packages/policy-clamp-docker/src/main/docker/DcaeParticipantDockerfile +++ /dev/null @@ -1,51 +0,0 @@ -#------------------------------------------------------------------------------- -# ============LICENSE_START======================================================= -# Copyright (C) 2021 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -#------------------------------------------------------------------------------- - -# -# Docker file to build an image that runs CLAMP on Java 11 or better in alpine -# -FROM onap/policy-jre-alpine:2.3.0 - -LABEL maintainer="Policy Team" - -ARG POLICY_LOGS=/var/log/onap/policy/clamp - -ENV POLICY_LOGS=$POLICY_LOGS -ENV POLICY_HOME=$POLICY_HOME/clamp - -RUN mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \ - chown -R policy:policy $POLICY_HOME $POLICY_LOGS && \ - mkdir /packages -COPY /maven/lib/dcae-participant.tar.gz /packages - -RUN tar xvfz /packages/dcae-participant.tar.gz --directory $POLICY_HOME && \ - rm /packages/dcae-participant.tar.gz - -WORKDIR $POLICY_HOME -COPY dcae-participant.sh bin/. -COPY /maven/app.jar /app - -RUN chown -R policy:policy * && \ - chmod 755 bin/*.sh && \ - chown -R policy:policy /app - -USER policy -WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "./dcae-participant.sh" ] diff --git a/packages/policy-clamp-docker/src/main/docker/dcae-participant.sh b/packages/policy-clamp-docker/src/main/docker/dcae-participant.sh deleted file mode 100644 index 620fa42cd..000000000 --- a/packages/policy-clamp-docker/src/main/docker/dcae-participant.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2021 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -else - CONFIG_FILE=${CONFIG_FILE} -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/DcaeParticipantParameters.yaml" -fi - -echo "Policy clamp config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml files" - cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/ -fi - -touch /app/app.jar -mkdir -p "${POLICY_HOME}"/config/ -cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/DcaeParticipantParameters.yaml - -$JAVA_HOME/bin/java -Djavax.net.ssl.keyStore="${KEYSTORE}" \ - -Djavax.net.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -jar /app/app.jar \ - --spring.config.location="${POLICY_HOME}/config/DcaeParticipantParameters.yaml" diff --git a/packages/policy-clamp-tarball/pom.xml b/packages/policy-clamp-tarball/pom.xml index 9be98dff2..f70b5c5c1 100644 --- a/packages/policy-clamp-tarball/pom.xml +++ b/packages/policy-clamp-tarball/pom.xml @@ -42,11 +42,6 @@ policy-clamp-participant-impl-policy ${project.version} - - org.onap.policy.clamp.participant - policy-clamp-participant-impl-dcae - ${project.version} - org.onap.policy.clamp.participant policy-clamp-participant-impl-kubernetes diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/DcaeParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/DcaeParticipantParameters.yaml deleted file mode 100644 index 5eedb9db4..000000000 --- a/packages/policy-clamp-tarball/src/main/resources/etc/DcaeParticipantParameters.yaml +++ /dev/null @@ -1,55 +0,0 @@ - -participant: - name: ControlLoopParticipantDcae - clampClientEndPoints: - status: /restservices/clds/v2/loop/getstatus/ - create: /restservices/clds/v2/loop/create/%s?templateName=%s - deploy: /restservices/clds/v2/loop/deploy/ - stop: /restservices/clds/v2/loop/stop/ - delete: /restservices/clds/v2/loop/delete/ - undeploy: /restservices/clds/v2/loop/undeploy/ - clampClientParameters: - clientName: Clamp - hostname: 0.0.0.0 - port: 8443 - userName: admin - password: password - https: true - aaf: false - consulClientEndPoints: - deploy: "/v1/kv/dcae-pmsh:" - consulClientParameters: - clientName: Consul - hostname: consul - port: 31321 - userName: admin - password: password - https: false - aaf: false - intermediaryParameters: - name: Participant parameters - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: - name: DCAEParticipant0 - version: 1.0.0 - participantType: - name: org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant - version: 2.3.4 - clampControlLoopTopics: - topicSources: - - - topic: POLICY-CLRUNTIME-PARTICIPANT - servers: - - ${topicServer:message-router} - topicCommInfrastructure: dmaap - fetchTimeout: 15000 - topicSinks: - - - topic: POLICY-CLRUNTIME-PARTICIPANT - servers: - - ${topicServer:message-router} - topicCommInfrastructure: dmaap - checkCount: 10 - secCount: 10 - jsonBodyConsulPath: src/main/resources/parameters/consul.json -- cgit 1.2.3-korg