From: Brian Freeman <bf1936@att.com>
Date: Mon, 14 May 2018 18:49:03 +0000 (-0500)
Subject: Fix robot preload
X-Git-Tag: 2.0.0-ONAP~118^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1fb36e6f1964755f49f10de5bed2216c4ba83179;p=oom.git

Fix robot preload

Issue-ID: OOM-1079
Change-Id: Ie45882ce193e73b91c13c03ef1a3fdc731002124
Signed-off-by: Brian Freeman <bf1936@att.com>
---

diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
index 502d8fcc63..17f33fc802 100755
--- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
@@ -2,15 +2,15 @@ GLOBAL_PRELOAD_PARAMETERS = {
     # heat template parameter values common to all heat template continaing these parameters
      "defaults" : {
          'key_name' : 'vfw_key${uuid}',
-         "pub_key" : "${pub_key}",
+         "pub_key" : "{{ .Values.vnfPubKey }}",
          "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw",
          "repo_url_artifacts" : "https://nexus.onap.org/content/groups/staging",
          "demo_artifacts_version" : "${GLOBAL_INJECTED_ARTIFACTS_VERSION}",
          "onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}",
          "onap_private_subnet_id" : "{{ .Values.openStackPrivateSubnetId }}",
          "onap_private_net_cidr" : "{{ .Values.openStackPrivateNetCidr }}",
-         "dcae_collector_ip" : "${dcae_collector_ip}",
-         "dcae_collector_port" : "8080",
+         "dcae_collector_ip" : "{{ .Values.dcaeCollectorIp }}",
+         "dcae_collector_port" : "30235",
          "public_net_id" : "${GLOBAL_INJECTED_PUBLIC_NET_ID}",
          "cloud_env" : "${GLOBAL_INJECTED_CLOUD_ENV}",
          "install_script_version" : "${GLOBAL_INJECTED_SCRIPT_VERSION}",
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 5e78f9545a..e3a2e13027 100644
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -77,6 +77,10 @@ openStackPrivateNetCidr: "10.0.0.0/8"
 # The first 2 octets of the private Openstack subnet where VNFs will be spawned.
 # Needed because sdnc preload templates hardcodes things like this 10.0.${ecompnet}.X
 openStackOamNetworkCidrPrefix: "10.0"
+# Override with Pub Key for access to VNF
+vnfPubKey: "FILL_IN_WITH_PUB_KEY"
+# Override with DCAE VES Collector external IP 
+dcaeCollectorIp: "FILL_IN_WITH_DCAE_VES_COLLECTOR_IP"
 
 # default number of instances
 replicaCount: 1