summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2019-05-10 17:30:59 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-10 17:30:59 +0000
commit4a8418f251cdd48c6773d5da0cca0cb4214b6289 (patch)
treeca5e8c49ac48d55661e4696da18b2296784e4316
parenta152ff4bececc3f12c70fc61c33246ab685bd1fc (diff)
parentf76496a261a76ae0d32cc247310e2e1b993c8858 (diff)
Merge "Update CMSO OOM to use HTTPS and AAF"
-rw-r--r--resources/config/eteshare/config/integration_robot_properties.py6
-rwxr-xr-xvalues.yaml3
2 files changed, 6 insertions, 3 deletions
diff --git a/resources/config/eteshare/config/integration_robot_properties.py b/resources/config/eteshare/config/integration_robot_properties.py
index f2f2161..453af83 100644
--- a/resources/config/eteshare/config/integration_robot_properties.py
+++ b/resources/config/eteshare/config/integration_robot_properties.py
@@ -126,10 +126,10 @@ GLOBAL_OOF_HOMING_SERVER_PORT = "8091"
# oof-sniro info - everything is from the private oam network (also called onap private network)
GLOBAL_OOF_SNIRO_SERVER_PORT = "8698"
# oof cmso global info - everything is from the private oam network (also called onap private network)
-GLOBAL_OOF_CMSO_PROTOCOL = "http"
+GLOBAL_OOF_CMSO_PROTOCOL = "https"
GLOBAL_OOF_CMSO_SERVER_PORT = "8080"
-GLOBAL_OOF_CMSO_USERNAME = "none"
-GLOBAL_OOF_CMSO_PASSWORD = "none"
+GLOBAL_OOF_CMSO_USERNAME = "{{ .Values.oofCmsoUsername }}"
+GLOBAL_OOF_CMSO_PASSWORD = "{{ .Values.oofCmsoPassword }}"
# openstack info - info to select right info in environment
# packet generate vnf info - everything is from the private oam network (also called onap private network)
GLOBAL_PACKET_GENERATOR_PORT = "8183"
diff --git a/values.yaml b/values.yaml
index af6c26b..6a73d5b 100755
--- a/values.yaml
+++ b/values.yaml
@@ -118,6 +118,9 @@ dcaePassword: "ZjJkYjllMjljMTI2M2Iz"
# DROOLS
droolsUsername: "demo@people.osaaf.org"
droolsPassword: "demo123456!"
+# OOF
+oofCmsoUsername: "oof@oof.onap.org"
+oofCmsoPassword: "demo123456!"
# POLICY
policyAuth: "dGVzdHBkcDphbHBoYTEyMw=="
policyClientAuth: "cHl0aG9uOnRlc3Q="