Merge "defaulting the vnf key"

diff --combined kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index 8a88fa6,ade2e72..b2fa288
--- 1/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
--- 2/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@@ -79,7 -79,7 +79,7 @@@ GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REG
  GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE = '{{ .Values.openStackProjectNameRegionThree }}'
  GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE = '{{ .Values.openStackDomainIdRegionThree }}'
  GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX = '{{ .Values.openStackOamNetworkCidrPrefix }}'
 -GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = 'public'
 +GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = '{{ .Values.openStackPublicNetworkName }}'
  GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP = '{{ .Values.openStackSecurityGroup }}'
  GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID = "{{ .Values.openStackPrivateSubnetId }}"
  GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR = "{{ .Values.openStackPrivateNetCidr }}"
@@@ -92,6 -92,7 +92,7 @@@ GLOBAL_INJECTED_POLICY_DISTRIBUTION_IP_
  GLOBAL_INJECTED_POLICY_PDPX_IP_ADDR = 'policy-xacml-pdp.{{include "common.namespace" .}}'
  GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR = 'policy-apex-pdp.{{include "common.namespace" .}}'
  GLOBAL_INJECTED_PUBLIC_NET_ID = '{{ .Values.openStackPublicNetId }}'
+ GLOBAL_INJECTED_PRIVATE_KEY = "{{ .Files.Get .Values.vnfPrivateKey }}"
  GLOBAL_INJECTED_PUBLIC_KEY = "{{ .Values.vnfPubKey }}"
  GLOBAL_INJECTED_REGION = '{{ .Values.openStackRegion }}'
  GLOBAL_INJECTED_SCRIPT_VERSION = '{{ .Values.scriptVersion }}'
@@@ -180,7 -181,7 +181,7 @@@ GLOBAL_INJECTED_PROPERTIES = 
      "GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE" : '{{ .Values.openStackProjectNameRegionThree }}',
      "GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE" : '{{ .Values.openStackDomainIdRegionThree }}',
      "GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX" : '{{ .Values.openStackOamNetworkCidrPrefix }}',
 -    "GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK" : 'public',
 +    "GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK" : '{{ .Values.openStackPublicNetworkName }}',
      "GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP": '{{ .Values.openStackSecurityGroup }}',
      "GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID" : "{{ .Values.openStackPrivateSubnetId }}",
      "GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR" : "{{ .Values.openStackPrivateNetCidr }}",
@@@ -193,7 -194,8 +194,8 @@@
      "GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR" : 'policy-apex-pdp.{{include "common.namespace" .}}',
      "GLOBAL_INJECTED_PORTAL_IP_ADDR" : 'portal-app.{{include "common.namespace" .}}',
      "GLOBAL_INJECTED_PUBLIC_NET_ID" : '{{ .Values.openStackPublicNetId }}',
-     "GLOBAL_INJECTED_PUBLIC_KEY" : "{{ .Values.vnfPubKey }}",
+     "GLOBAL_INJECTED_PRIVATE_KEY" : '{{ .Files.Get .Values.vnfPrivateKey }}',
+     "GLOBAL_INJECTED_PUBLIC_KEY" : '{{ .Values.vnfPubKey }}',
      "GLOBAL_INJECTED_REGION" : '{{ .Values.openStackRegion }}',
      "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : 'sdc-be.{{include "common.namespace" .}}',
      "GLOBAL_INJECTED_SDC_BE_ONBOARD_IP_ADDR" : 'sdc-onboarding-be.{{include "common.namespace" .}}',
@@@ -219,4 -221,4 +221,4 @@@
      "GLOBAL_INJECTED_VM_FLAVOR" : '{{ .Values.openStackFlavourMedium }}',
      "GLOBAL_INJECTED_VNFSDK_IP_ADDR" : 'refrepo.{{include "common.namespace" .}}'
  
 -}
 +}

diff --combined kubernetes/robot/values.yaml
index 29b8aa7,16ca1d9..cb10e38
--- 1/kubernetes/robot/values.yaml
--- 2/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@@ -80,7 -80,6 +80,7 @@@ openStackUserDomain:  "Default
  
  # UUID of the Openstack network that can assign floating ips.  Maps to GLOBAL_INJECTED_PUBLIC_NET_ID
  openStackPublicNetId: "e8f51958045716781ffc"
 +openStackPublicNetworkName: "public"
  # password for Openstack tenant where VNFs will be spawned.  Maps to GLOBAL_INJECTED_OPENSTACK_PASSWORD
  openStackPassword: "tenantPassword"
  # Openstack region.  Maps to GLOBAL_INJECTED_REGION
@@@ -122,7 -121,9 +122,9 @@@ openStackOamNetworkCidrPrefix: "10.0
  vidServerProtocol:  "http"
  vidServerPort:  "8080"
  # Override with Pub Key for access to VNF
- vnfPubKey: "FILL_IN_WITH_PUB_KEY"
+ vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh imported-openssh-key"
+ # Override with Private Key for access to VNF
+ vnfPrivateKey: "onap_dev.yaml"
  # Override with DCAE VES Collector external IP
  dcaeCollectorIp: "FILL_IN_WITH_DCAE_VES_COLLECTOR_IP"