diff options
| -rw-r--r-- | kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py | 52 | ||||
| -rwxr-xr-x | kubernetes/robot/values.yaml | 45 |
2 files changed, 70 insertions, 27 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py index f459e9d1b7..38bfceb12a 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py @@ -14,18 +14,18 @@ # aaf info - everything is from the private oam network (also called onap private network) GLOBAL_AAF_SERVER = "https://aaf-service.{{include "common.namespace" .}}:8100" -GLOBAL_AAF_USERNAME = "demo@people.osaaf.org" -GLOBAL_AAF_PASSWORD = "demo123456!" +GLOBAL_AAF_USERNAME = "{{ .Values.aafUsername }}" +GLOBAL_AAF_PASSWORD = "{{ .Values.aafPassword }}" # aai info - everything is from the private oam network (also called onap private network) GLOBAL_AAI_SERVER_PROTOCOL = "https" GLOBAL_AAI_SERVER_PORT = "8443" -GLOBAL_AAI_USERNAME = "aai@aai.onap.org" -GLOBAL_AAI_PASSWORD = "demo123456!" +GLOBAL_AAI_USERNAME = "{{ .Values.aaiUsername }}" +GLOBAL_AAI_PASSWORD = "{{ .Values.aaiPassword}}" # appc info - everything is from the private oam network (also called onap private network) GLOBAL_APPC_SERVER_PROTOCOL = "http" GLOBAL_APPC_SERVER_PORT = "8282" -GLOBAL_APPC_USERNAME = "admin" -GLOBAL_APPC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" +GLOBAL_APPC_USERNAME = "{{ .Values.appcUsername }}" +GLOBAL_APPC_PASSWORD = "{{ .Values.appcPassword }}" GLOBAL_APPC_CDT_SERVER_PROTOCOL = "http" GLOBAL_APPC_CDT_SERVER_PORT = "80" GLOBAL_APPC_CDT_USERNAME = "demo" @@ -48,8 +48,8 @@ GLOBAL_CLI_SERVER_PORT = "8080" # dcae info - everything is from the private oam network (also called onap private network) GLOBAL_DCAE_SERVER_PROTOCOL = "http" GLOBAL_DCAE_HEALTH_SERVER_PORT = "80" -GLOBAL_DCAE_USERNAME = "console" -GLOBAL_DCAE_PASSWORD = "ZjJkYjllMjljMTI2M2Iz" +GLOBAL_DCAE_USERNAME = "{{ .Values.dcaeUsername }}" +GLOBAL_DCAE_PASSWORD = "{{ .Values.dcaePassword}}" # data router info - everything is from the private oam network (also called onap private network) GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL = "http" GLOBAL_DMAAP_DR_PROV_SERVER_PORT = "8080" @@ -57,8 +57,8 @@ GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "http" GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8080" # DROOL server port and credentials GLOBAL_DROOLS_SERVER_PORT = "9696" -GLOBAL_DROOLS_USERNAME = "demo@people.osaaf.org" -GLOBAL_DROOLS_PASSWORD = "demo123456!" +GLOBAL_DROOLS_USERNAME = "{{ .Values.droolsUsername }}" +GLOBAL_DROOLS_PASSWORD = "{{ .Values.droolsPassword }}" # log server config - NOTE: no log server is run in HEAT; only on OOM GLOBAL_LOG_SERVER_PROTOCOL = "http" GLOBAL_LOG_ELASTICSEARCH_PORT = "9200" @@ -88,10 +88,10 @@ GLOBAL_MSO_REQDB_SERVER_PORT = "8083" GLOBAL_MSO_SDNC_SERVER_PORT = "8086" GLOBAL_MSO_VFC_SERVER_PORT = "8084" -GLOBAL_MSO_USERNAME = "InfraPortalClient" -GLOBAL_MSO_CATDB_USERNAME = "bpel" -GLOBAL_MSO_PASSWORD = "password1$" - +GLOBAL_MSO_USERNAME = "{{ .Values.soUsername }}" +GLOBAL_MSO_CATDB_USERNAME = "{{ .Values.soCatdbUsername }}" +GLOBAL_MSO_PASSWORD = "{{ .Values.soPassword }}" +# robot uses MSO_PASSWORD for both SO and CATDB # music info - everything is from the private oam network (also called onap private network) GLOBAL_MUSIC_SERVER_PROTOCOL = "http" GLOBAL_MUSIC_SERVER_PORT = "8080" @@ -111,21 +111,21 @@ GLOBAL_PGN_PORT = "2831" GLOBAL_POLICY_SERVER_PROTOCOL = "https" GLOBAL_POLICY_SERVER_PORT = "8081" GLOBAL_POLICY_HEALTHCHECK_PORT = "6969" -GLOBAL_POLICY_AUTH = "dGVzdHBkcDphbHBoYTEyMw==" -GLOBAL_POLICY_CLIENTAUTH = "cHl0aG9uOnRlc3Q=" -GLOBAL_POLICY_USERNAME = "demo@people.osaaf.org" -GLOBAL_POLICY_PASSWORD = "demo123456!" +GLOBAL_POLICY_AUTH = "{{ .Values.policyAuth}}" +GLOBAL_POLICY_CLIENTAUTH = "{{ .Values.policyClientAuth}}" +GLOBAL_POLICY_USERNAME = "{{ .Values.policyUsername }}" +GLOBAL_POLICY_PASSWORD = "{{ .Values.policyPassword }}" # portal info - everything is from the private oam network (also called onap private network) GLOBAL_PORTAL_SERVER_PROTOCOL = "http" GLOBAL_PORTAL_SERVER_PORT = "8989" -GLOBAL_PORTAL_USERNAME = "demo" -GLOBAL_PORTAL_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse" +GLOBAL_PORTAL_USERNAME = "{{ .Values.portalUsername }}" +GLOBAL_PORTAL_PASSWORD = "{{ .Values.portalPassword }}" # sdngc info - everything is from the private oam network (also called onap private network) GLOBAL_SDNGC_SERVER_PROTOCOL = "http" GLOBAL_SDNGC_REST_PORT = "8282" GLOBAL_SDNGC_ADMIN_PORT = "8843" -GLOBAL_SDNGC_USERNAME = "admin" -GLOBAL_SDNGC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" +GLOBAL_SDNGC_USERNAME = "{{ .Values.sdncUsername }}" +GLOBAL_SDNGC_PASSWORD = "{{ .Values.sdncPassword }}" # sms (AAF) info GLOBAL_SMS_SERVER_PROTOCOL = "https" GLOBAL_SMS_SERVER_NAME = "aaf-sms.{{include "common.namespace" .}}" @@ -133,10 +133,10 @@ GLOBAL_SMS_SERVER_PORT = "10443" # vid info - everything is from the private oam network (also called onap private network) GLOBAL_VID_SERVER_PROTOCOL = "https" GLOBAL_VID_SERVER_PORT = "8443" -GLOBAL_VID_USERNAME = "demo" -GLOBAL_VID_PASSWORD = "Kp8bJ4SXszM0WX" -GLOBAL_VID_HEALTH_USERNAME = "Default" -GLOBAL_VID_HEALTH_PASSWORD = "AppPassword!1" +GLOBAL_VID_USERNAME = "{{ .Values.vidUsername }}" +GLOBAL_VID_PASSWORD = "{{ .Values.vidPassword}}" +GLOBAL_VID_HEALTH_USERNAME = "{{ .Values.vidHealthUsername }}" +GLOBAL_VID_HEALTH_PASSWORD = "{{ .Values.vidHealthPassword }}" # vnfsdk info - everything is from the private oam network (also called onap private network) GLOBAL_VNFSDK_SERVER_PROTOCOL = "http" GLOBAL_VNFSDK_SERVER_PORT = "8702" diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 7fb9885596..6a11f2bf0c 100755 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -60,7 +60,7 @@ openStackProjectName: "onap" # Domain id of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID openStackDomainId: "default" # Openstack Keystone API version. Valid values are [ v2.0, v3 ]. Maps to GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION -openStackKeystoneAPIVersion: "" +openStackKeystoneAPIVersion: "v2.0" # Openstack glance image name for Ubuntu 14. Maps to GLOBAL_INJECTED_UBUNTU_1404_IMAGE ubuntu14Image: "Ubuntu_14_trusty" # Openstack glance image name for Ubuntu 16. Maps to GLOBAL_INJECTED_UBUNTU_1604_IMAGE @@ -78,11 +78,54 @@ 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" +# VID protocol/port until Selenium issue with SSL resolved +# https/8443 vs http/8080 +vidServerProtocol: "http" +vidServerPort: "8080" # 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" +# Credentials for ONAP Component +# AAF +aafUsername: "demo@people.osaaf.org" +aafPassword: "demo123456!" +# AAI +aaiUsername: "aai@aai.onap.org" +aaiPassword: "demo123456!" +# APPC +appcUsername: "admin" +appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" +# DCAE +dcaeUsername: "console" +dcaePassword: "ZjJkYjllMjljMTI2M2Iz" +# DROOLS +droolsUsername: "demo@people.osaaf.org" +droolsPassword: "demo123456!" +# POLICY +policyAuth: "dGVzdHBkcDphbHBoYTEyMw==" +policyClientAuth: "cHl0aG9uOnRlc3Q=" +policyUsername: "demo@people.osaaf.org" +policyPassword: "demo123456!" +# PORTAL +portalUsername: "demo" +portalPassword: "Kp8bJ4SXszM0WXlhak3eHlcse" +# SO +soUsername: "InfraPortalClient" +soPassword: "password1$" +soCatdbUsername: "bpel" +soCatdbPassword: "password1$" +# SDNC +sdncUsername: "admin" +sdncPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" +# VID +vidUsername: "demo" +vidPassword: "Kp8bJ4SXszM0WX" +vidHealthUsername: "Default" +vidHealthPassword: "AppPassword!1" + + # default number of instances replicaCount: 1 |