From: Mike Elliott <mike.elliott@amdocs.com>
Date: Fri, 6 Apr 2018 19:32:27 +0000 (+0000)
Subject: Merge "Correcting portal k8s configmap service names"
X-Git-Tag: 2.0.0-ONAP~302
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6cfff80ec93d4a4fa3bdeb5289a70c4296560db1;p=oom.git

Merge "Correcting portal k8s configmap service names"
---

6cfff80ec93d4a4fa3bdeb5289a70c4296560db1
diff --cc kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index 7900eac071,7296eb790c..c62c4402b7
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@@ -23,9 -23,9 +23,9 @@@ GLOBAL_INJECTED_OPENO_IP_ADDR = "msb-ia
  GLOBAL_INJECTED_OPENSTACK_PASSWORD = "{{ .Values.openStackEncryptedPassword }}"
  GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "{{ .Values.openStackTenantId }}"
  GLOBAL_INJECTED_OPENSTACK_USERNAME = "{{ .Values.openStackUserName }}"
 -GLOBAL_INJECTED_POLICY_IP_ADDR = "{{.Release.Name}}-pypdp.{{include "common.namespace" .}}"
 +GLOBAL_INJECTED_POLICY_IP_ADDR = "pdp.{{include "common.namespace" .}}"
  GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "{{.Release.Name}}-drools.{{include "common.namespace" .}}"
- GLOBAL_INJECTED_PORTAL_IP_ADDR = "{{.Release.Name}}-portalapps.{{include "common.namespace" .}}"
+ GLOBAL_INJECTED_PORTAL_IP_ADDR = "{{.Release.Name}}-portal-app.{{include "common.namespace" .}}"
  GLOBAL_INJECTED_REGION = "{{ .Values.openStackRegion }}"
  GLOBAL_INJECTED_REMOTE_REPO = "http://gerrit.onap.org/r/testsuite/properties.git"
  GLOBAL_INJECTED_SDC_IP_ADDR = "{{.Release.Name}}-sdc-be.{{include "common.namespace" .}}"