diff options
| -rw-r--r-- | blueprints/k8s-datafile-collector.yaml-template | 2 | ||||
| -rw-r--r-- | blueprints/k8s-prh.yaml-template | 17 | ||||
| -rwxr-xr-x | mvn-phase-script.sh | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/blueprints/k8s-datafile-collector.yaml-template b/blueprints/k8s-datafile-collector.yaml-template index d1c571b..27446d5 100644 --- a/blueprints/k8s-datafile-collector.yaml-template +++ b/blueprints/k8s-datafile-collector.yaml-template @@ -58,7 +58,7 @@ inputs: default: "dradmin"
tag_version:
type: string
- default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.0.3"
+ default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.1.0"
replicas:
type: integer
description: number of instances
diff --git a/blueprints/k8s-prh.yaml-template b/blueprints/k8s-prh.yaml-template index eab58af..198ece3 100644 --- a/blueprints/k8s-prh.yaml-template +++ b/blueprints/k8s-prh.yaml-template @@ -26,7 +26,7 @@ imports: inputs: aaiEnrichmentHost: type: string - default: "aai.onap.svc.cluster.local" + default: "aai" aaiEnrichmentPort: type: integer default: 8443 @@ -41,7 +41,7 @@ inputs: dmaap_host: type: string description: dmaap host - default: message-router.onap.svc.cluster.local + default: message-router dmaap_port: type: integer description: dmaap port @@ -64,6 +64,10 @@ inputs: host_port: description: port on Kubernetes host where PRH API will be exposed default: 0 + secureEnableCert: + type: boolean + description: enable certificate base connection with AAI and DMaap + default: false node_templates: prh: properties: @@ -94,6 +98,13 @@ node_templates: aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors: true aai.aaiClientConfiguration.aaiBasePath: "/aai/v12" aai.aaiClientConfiguration.aaiPnfPath: "/network/pnfs/pnf" + secure.configuration.keyFile: "/opt/app/prh/local/org.onap.prh.keyfile" + secure.configuration.trustStore: "/opt/app/prh/local/org.onap.prh.trust.jks" + secure.configuration.trustStorePassword: "change it" + secure.configuration.keyStore: "/opt/app/prh/local/org.onap.prh.p12" + secure.configuration.keyStorePassword: "change it" + secure.configuration.enableAaiCertAuth: { get_input: secureEnableCert } + secure.configuration.enableDmaapCertAuth: { get_input: secureEnableCert } host_port: { get_input: host_port } container_port: @@ -105,7 +116,7 @@ node_templates: timeout: 1s type: http image: - get_input: tag_version + get_input: { get_input: tag_version } replicas: {get_input: replicas} name: 'dcae-prh' dns_name: 'dcae-prh' diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh index 08b0148..5e29609 100755 --- a/mvn-phase-script.sh +++ b/mvn-phase-script.sh @@ -85,7 +85,7 @@ echo "MVN_DOCKERREGISTRY_PUBLIC is [$MVN_DOCKERREGISTRY_PUBLIC]" echo "HOME is [$HOME]" echo "PROJECT_ROOT is [$PROJECT_ROOT]" -MVN_RELEASE_TAG="${MVN_RELEASE_TAG:-R3}" +MVN_RELEASE_TAG="${MVN_RELEASE_TAG:-R4}" if ! wget -O ${PROJECT_ROOT}/mvn-phase-lib.sh \ |