From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Thu, 11 Apr 2019 14:46:50 +0000 (+0000)
Subject: Merge "move cdt GUI to https"
X-Git-Tag: 4.0.0-ONAP~241
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b7e876f2735b5e0636b387aa0fa4eb9054dc5ca0;hp=-c;p=oom.git

Merge "move cdt GUI to https"
---

b7e876f2735b5e0636b387aa0fa4eb9054dc5ca0
diff --combined kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
index 5e6288e5e7,d55fa8faca..52a8c430bc
--- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@@ -26,7 -26,7 +26,7 @@@ GLOBAL_APPC_SERVER_PROTOCOL = "http
  GLOBAL_APPC_SERVER_PORT = "8282"
  GLOBAL_APPC_USERNAME = "{{ .Values.appcUsername }}"
  GLOBAL_APPC_PASSWORD = "{{ .Values.appcPassword }}"
- GLOBAL_APPC_CDT_SERVER_PROTOCOL = "http"
+ GLOBAL_APPC_CDT_SERVER_PROTOCOL = "https"
  GLOBAL_APPC_CDT_SERVER_PORT = "18080"
  GLOBAL_APPC_CDT_USERNAME = "demo"
  # sdc info - everything is from the private oam network (also called onap private network)
@@@ -65,19 -65,10 +65,19 @@@ GLOBAL_LOG_ELASTICSEARCH_PORT = "9200
  GLOBAL_LOG_LOGSTASH_PORT = "9600"
  GLOBAL_LOG_KIBANA_PORT = "5601"
  # pomba info - NOTE: no pomba is run in HEAT; only on OOM
 -GLOBAL_POMBA_SERVER_PROTOCOL = "http"
 +GLOBAL_POMBA_SERVER_PROTOCOL_HTTP = "http"
 +GLOBAL_POMBA_SERVER_PROTOCOL_HTTPS = "https"
  GLOBAL_POMBA_AAICONTEXTBUILDER_PORT = "9530"
  GLOBAL_POMBA_SDCCONTEXTBUILDER_PORT = "9530"
  GLOBAL_POMBA_NETWORKDISCCONTEXTBUILDER_PORT = "9530"
 +GLOBAL_POMBA_SERVICEDECOMPOSITION_PORT = "9532"
 +GLOBAL_POMBA_SDNCCXTBUILDER_PORT = "9530"
 +GLOBAL_POMBA_NETWORKDISCOVERY_MICROSERVICE_PORT = "9531"
 +GLOBAL_POMBA_VALIDATIONSERVICE_PORT = "9529"
 +GLOBAL_POMBA_KIBANA_PORT = "5601"
 +GLOBAL_POMBA_ELASTICSEARCH_PORT = "9200"
 +GLOBAL_POMBA_CONTEXTAGGREGATOR_PORT = "9529"
 +
  # microservice bus info - everything is from the private oam network (also called onap private network)
  GLOBAL_MSB_SERVER_PROTOCOL = "http"
  GLOBAL_MSB_SERVER_PORT = "80"