diff options
Diffstat (limited to 'packages')
11 files changed, 44 insertions, 21 deletions
diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml index 4b848636d..451be1ec4 100644 --- a/packages/policy-clamp-docker/pom.xml +++ b/packages/policy-clamp-docker/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>clamp-packages</artifactId> - <version>6.1.2-SNAPSHOT</version> + <version>6.1.3-SNAPSHOT</version> </parent> <packaging>pom</packaging> @@ -92,7 +92,7 @@ <images> <image> - <name>onap/policy-controlloop-runtime</name> + <name>onap/policy-clamp-cl-runtime</name> <build> <cleanup>try</cleanup> <dockerFile>ClRuntimeDockerfile</dockerFile> @@ -123,8 +123,8 @@ </build> </image> <image> - <name>onap/policy-participant</name> - <alias>onap-policy-participant</alias> + <name>onap/policy-clamp-cl-pf-ppnt</name> + <alias>onap-policy-clamp-cl-pf-ppnt</alias> <build> <cleanup>try</cleanup> <dockerFile>PolicyParticipantDockerfile</dockerFile> @@ -155,8 +155,8 @@ </build> </image> <image> - <name>onap/kubernetes-participant</name> - <alias>onap-kubernetes-participant</alias> + <name>onap/policy-clamp-cl-k8s-ppnt</name> + <alias>onap-policy-clamp-cl-k8s-ppnt</alias> <build> <cleanup>try</cleanup> <dockerFile>KubernetesParticipantDockerfile</dockerFile> @@ -187,8 +187,8 @@ </build> </image> <image> - <name>onap/http-participant</name> - <alias>onap-http-participant</alias> + <name>onap/policy-clamp-cl-http-ppnt</name> + <alias>onap-policy-clamp-cl-http-ppnt</alias> <build> <cleanup>try</cleanup> <dockerFile>HttpParticipantDockerfile</dockerFile> diff --git a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh b/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh index 6d12e590a..59d31dc8e 100644 --- a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh +++ b/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh @@ -56,8 +56,9 @@ touch /app/app.jar mkdir -p "${POLICY_HOME}"/config/ cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/ClRuntimeParameters.yaml -$JAVA_HOME/bin/java -Djavax.net.ssl.keyStore="${KEYSTORE}" \ - -Djavax.net.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ +$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \ + -Dserver.ssl.keyStore="${KEYSTORE}" \ + -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ -jar /app/app.jar \ diff --git a/packages/policy-clamp-docker/src/main/docker/http-participant.sh b/packages/policy-clamp-docker/src/main/docker/http-participant.sh index d74b903e3..17daa18f9 100644 --- a/packages/policy-clamp-docker/src/main/docker/http-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/http-participant.sh @@ -55,9 +55,10 @@ fi mkdir -p "${POLICY_HOME}"/config/ cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/HttpParticipantParameters.yaml -$JAVA_HOME/bin/java -Dserver.ssl.keyStore="${KEYSTORE}" \ +$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \ + -Dserver.ssl.keyStore="${KEYSTORE}" \ -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Dserver.ssl.trustStore="${TRUSTSTORE}" \ - -Dserver.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ + -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ + -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ -jar /app/app.jar \ --spring.config.location="${POLICY_HOME}/config/HttpParticipantParameters.yaml" diff --git a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh index cb5ae9251..3c5fe5c63 100644 --- a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh @@ -55,9 +55,10 @@ fi mkdir -p "${POLICY_HOME}"/config/ cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/KubernetesParticipantParameters.yaml -$JAVA_HOME/bin/java -Dserver.ssl.keyStore="${KEYSTORE}" \ +$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \ + -Dserver.ssl.keyStore="${KEYSTORE}" \ -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Dserver.ssl.trustStore="${TRUSTSTORE}" \ - -Dserver.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ + -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ + -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ -jar /app/app.jar \ --spring.config.location="${POLICY_HOME}/config/KubernetesParticipantParameters.yaml" diff --git a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh index 7949fab72..77cd0c02b 100644 --- a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh +++ b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh @@ -56,8 +56,9 @@ touch /app/app.jar mkdir -p "${POLICY_HOME}"/config/ cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/PolicyParticipantParameters.yaml -$JAVA_HOME/bin/java -Djavax.net.ssl.keyStore="${KEYSTORE}" \ - -Djavax.net.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ +$JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \ + -Dserver.ssl.keyStore="${KEYSTORE}" \ + -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ -jar /app/app.jar \ diff --git a/packages/policy-clamp-tarball/pom.xml b/packages/policy-clamp-tarball/pom.xml index f70b5c5c1..ea564c4dc 100644 --- a/packages/policy-clamp-tarball/pom.xml +++ b/packages/policy-clamp-tarball/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>clamp-packages</artifactId> - <version>6.1.2-SNAPSHOT</version> + <version>6.1.3-SNAPSHOT</version> </parent> <artifactId>policy-clamp-tarball</artifactId> diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml index ade249e99..c8601cbdd 100644 --- a/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml +++ b/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml @@ -44,12 +44,14 @@ runtime: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 + useHttps: true topicSinks: - topic: POLICY-CLRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap + useHttps: true management: endpoints: diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml index 76f48bbdd..be421fcae 100644 --- a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml +++ b/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml @@ -15,9 +15,10 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 + useHttps: true topicSinks: - topic: POLICY-CLRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - + useHttps: true diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml index ebd744f13..d605cfa1d 100644 --- a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml +++ b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml @@ -26,12 +26,14 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 + useHttps: true topicSinks: - topic: POLICY-CLRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap + useHttps: true management: endpoints: @@ -42,6 +44,8 @@ server: # Configuration of the HTTP/REST server. The parameters are defined and handled by the springboot framework. # See springboot documentation. port: 8083 + servlet: + context-path: /onap/k8sparticipant logging: # Configuration of logging diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml index 1ea5d68c0..bd9a6260a 100644 --- a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml +++ b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml @@ -1,5 +1,7 @@ participant: + pdpGroup: defaultGroup + pdpType: apex policyApiParameters: clientName: api hostname: policy-api @@ -8,6 +10,14 @@ participant: password: zb!XztG34 https: true allowSelfSignedCerts: true + policyPapParameters: + clientName: pap + hostname: policy-pap + port: 6969 + userName: healthcheck + password: zb!XztG34 + https: true + allowSelfSignedCerts: true intermediaryParameters: reportingTimeIntervalMs: 120000 description: Participant Description @@ -25,9 +35,11 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 + useHttps: true topicSinks: - topic: POLICY-CLRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap + useHttps: true diff --git a/packages/pom.xml b/packages/pom.xml index 4f5a0849e..07258cd44 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp</artifactId> - <version>6.1.2-SNAPSHOT</version> + <version>6.1.3-SNAPSHOT</version> </parent> <artifactId>clamp-packages</artifactId> |