Fix ports and attributes

Fix ports exposed by container and attributes read by PRH

Change-Id: I8b8ce0db821112ec44ef1c6e52a95fd40ad35457
Issue-ID: DCAEGEN2-696
Signed-off-by: Jakub Zieba <jakub.zieba@nokia.com>

diff --git a/blueprints/k8s-prh.yaml-template b/blueprints/k8s-prh.yaml-template
index 7a5093b..5e80d33 100644 (file)
--- a/blueprints/k8s-prh.yaml-template
+++ b/blueprints/k8s-prh.yaml-template
@@ -60,9 +60,12 @@ inputs:
   replicas:
     type: integer
     description: number of instances
-    default: 1 
+    default: 1
+  host_port:
+    description: port on Kubernetes host where PRH API will be exposed
+    default: 0
 node_templates:
-  prh:             
+  prh:
     properties:
       application_config:
         dmaap.dmaapConsumerConfiguration.dmaapHostName: { get_input: dmaap_host }
@@ -74,7 +77,7 @@ node_templates:
         dmaap.dmaapConsumerConfiguration.dmaapContentType: "application/json"
         dmaap.dmaapConsumerConfiguration.consumerId: "c12"
         dmaap.dmaapConsumerConfiguration.consumerGroup: "OpenDCAE-c12"
-        dmaap.dmaapConsumerConfiguration.timeoutMS: -1
+        dmaap.dmaapConsumerConfiguration.timeoutMs: -1
         dmaap.dmaapConsumerConfiguration.messageLimit: -1
         dmaap.dmaapProducerConfiguration.dmaapHostName: { get_input: dmaap_host }
         dmaap.dmaapProducerConfiguration.dmaapPortNumber: { get_input: dmaap_port }
@@ -84,13 +87,17 @@ node_templates:
         dmaap.dmaapProducerConfiguration.dmaapUserPassword: { get_input: dmaap_passwd }
         dmaap.dmaapProducerConfiguration.dmaapContentType: "application/json"
         aai.aaiClientConfiguration.aaiHost: { get_input: aaiEnrichmentHost }
-        aai.aaiClientConfigurationaaiHostPortNumber: { get_input: aaiEnrichmentPort }
-        aai.aaiClientConfigurationaaiProtocol: "https"
-        aai.aaiClientConfigurationaaiUserName: { get_input: aaiEnrichmentUser }
-        aai.aaiClientConfigurationaaiUserPassword: { get_input: aaiEnrichmentPasswd }
-        aai.aaiClientConfigurationaaiIgnoreSSLCertificateErrors: true
-        aai.aaiClientConfigurationaaiBasePath: "/aai/v12"
-        aai.aaiClientConfigurationaaiPnfPath: "/network/pnfs/pnf"    
+        aai.aaiClientConfiguration.aaiHostPortNumber: { get_input: aaiEnrichmentPort }
+        aai.aaiClientConfiguration.aaiProtocol: "https"
+        aai.aaiClientConfiguration.aaiUserName: { get_input: aaiEnrichmentUser }
+        aai.aaiClientConfiguration.aaiUserPassword: { get_input: aaiEnrichmentPasswd }
+        aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors: true
+        aai.aaiClientConfiguration.aaiBasePath: "/aai/v12"
+        aai.aaiClientConfiguration.aaiPnfPath: "/network/pnfs/pnf"
+      host_port:
+          { get_input: host_port }
+      container_port:
+        8100
       docker_config:
         healthcheck:
           endpoint: /heartbeat