diff options
Diffstat (limited to 'resources/config')
| -rw-r--r-- | resources/config/eteshare/config/integration_robot_properties.py | 46 | ||||
| -rw-r--r-- | resources/config/eteshare/config/vm_properties.py | 8 |
2 files changed, 27 insertions, 27 deletions
diff --git a/resources/config/eteshare/config/integration_robot_properties.py b/resources/config/eteshare/config/integration_robot_properties.py index 40a5ba1..cd345d3 100644 --- a/resources/config/eteshare/config/integration_robot_properties.py +++ b/resources/config/eteshare/config/integration_robot_properties.py @@ -33,13 +33,13 @@ 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) -GLOBAL_ASDC_SERVER_PROTOCOL = "http" -GLOBAL_ASDC_FE_PORT = "8181" -GLOBAL_ASDC_BE_PORT = "8080" -GLOBAL_ASDC_BE_ONBOARD_PORT = "8081" -GLOBAL_ASDC_USERNAME = "beep" -GLOBAL_ASDC_PASSWORD = "boop" -GLOBAL_ASDC_AUTHENTICATION = [GLOBAL_ASDC_USERNAME, GLOBAL_ASDC_PASSWORD] +GLOBAL_SDC_SERVER_PROTOCOL = "http" +GLOBAL_SDC_FE_PORT = "8181" +GLOBAL_SDC_BE_PORT = "8080" +GLOBAL_SDC_BE_ONBOARD_PORT = "8081" +GLOBAL_SDC_USERNAME = "beep" +GLOBAL_SDC_PASSWORD = "boop" +GLOBAL_SDC_AUTHENTICATION = [GLOBAL_SDC_USERNAME, GLOBAL_SDC_PASSWORD] # clamp info - everything is from the private oam network (also called onap private network) GLOBAL_CLAMP_SERVER_PROTOCOL = "https" GLOBAL_CLAMP_SERVER_PORT = "8443" @@ -104,23 +104,23 @@ GLOBAL_MR_SERVER_PORT = "3904" GLOBAL_BC_HTTPS_SERVER_PORT = "8443" GLOBAL_BC_USERNAME = '{{ .Values.bcUsername }}' GLOBAL_BC_PASSWORD = '{{ .Values.bcPassword }}' -# mso info - everything is from the private oam network (also called onap private network) -GLOBAL_MSO_SERVER_PROTOCOL = "http" -GLOBAL_MSO_SERVER_PORT = "8080" +# so info - everything is from the private oam network (also called onap private network) +GLOBAL_SO_SERVER_PROTOCOL = "http" +GLOBAL_SO_SERVER_PORT = "8080" # SO containers -GLOBAL_MSO_APIHAND_SERVER_PORT = "8080" -GLOBAL_MSO_ASDCHAND_SERVER_PORT = "8085" -GLOBAL_MSO_BPMN_SERVER_PORT = "8081" -GLOBAL_MSO_CATDB_SERVER_PORT = "8082" -GLOBAL_MSO_OPENSTACK_SERVER_PORT = "8087" -GLOBAL_MSO_REQDB_SERVER_PORT = "8083" -GLOBAL_MSO_SDNC_SERVER_PORT = "8086" -GLOBAL_MSO_VFC_SERVER_PORT = "8084" -GLOBAL_MSO_VNFM_SERVER_PORT = "9092" -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 +GLOBAL_SO_APIHAND_SERVER_PORT = "8080" +GLOBAL_SO_SDCHAND_SERVER_PORT = "8085" +GLOBAL_SO_BPMN_SERVER_PORT = "8081" +GLOBAL_SO_CATDB_SERVER_PORT = "8082" +GLOBAL_SO_OPENSTACK_SERVER_PORT = "8087" +GLOBAL_SO_REQDB_SERVER_PORT = "8083" +GLOBAL_SO_SDNC_SERVER_PORT = "8086" +GLOBAL_SO_VFC_SERVER_PORT = "8084" +GLOBAL_SO_VNFM_SERVER_PORT = "9092" +GLOBAL_SO_USERNAME = '{{ .Values.soUsername }}' +GLOBAL_SO_CATDB_USERNAME = '{{ .Values.soCatdbUsername }}' +GLOBAL_SO_PASSWORD = '{{ .Values.soPassword }}' +# robot uses SO_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" diff --git a/resources/config/eteshare/config/vm_properties.py b/resources/config/eteshare/config/vm_properties.py index a17845d..bdd9b1d 100644 --- a/resources/config/eteshare/config/vm_properties.py +++ b/resources/config/eteshare/config/vm_properties.py @@ -73,7 +73,7 @@ GLOBAL_INJECTED_KEYSTONE_REGION_THREE = '{{ .Values.openStackKeyStoneUrlRegionTh GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE = '{{ .Values.openStackKeystoneAPIVersionRegionThree }}' GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE = '{{ .Values.openStackUserNameRegionThree }}' GLOBAL_INJECTED_OPENSTACK_PASSWORD_REGION_THREE = '{{ .Values.openStackPasswordRegionThree }}' -GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE = '{{ .Values.openSackMsoEncryptdPasswordRegionThree }}' +GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD_REGION_THREE = '{{ .Values.openSackMsoEncryptdPasswordRegionThree }}' GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD = '{{ .Values.config.openStackSoEncryptedPassword}}' GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE = '{{ .Values.openStackTenantIdRegionThree }}' GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE = '{{ .Values.openStackProjectNameRegionThree }}' @@ -103,7 +103,7 @@ GLOBAL_INJECTED_SDC_IP_ADDR = 'N/A' GLOBAL_INJECTED_SDNC_IP_ADDR = 'sdnc.{{include "common.namespace" .}}' GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR = 'sdnc-portal.{{include "common.namespace" .}}' GLOBAL_INJECTED_SO_APIHAND_IP_ADDR = 'so.{{include "common.namespace" .}}' -GLOBAL_INJECTED_SO_ASDCHAND_IP_ADDR = 'so-sdc-controller.{{include "common.namespace" .}}' +GLOBAL_INJECTED_SO_SDCHAND_IP_ADDR = 'so-sdc-controller.{{include "common.namespace" .}}' GLOBAL_INJECTED_SO_BPMN_IP_ADDR = 'so-bpmn-infra.{{include "common.namespace" .}}' GLOBAL_INJECTED_SO_CATDB_IP_ADDR = 'so-catalog-db-adapter.{{include "common.namespace" .}}' GLOBAL_INJECTED_SO_IP_ADDR = 'so.{{include "common.namespace" .}}' @@ -175,7 +175,7 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE" : '{{ .Values.openStackKeystoneAPIVersionRegionThree }}', "GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE" : '{{ .Values.openStackUserNameRegionThree }}', "GLOBAL_INJECTED_OPENSTACK_PASSWORD_REGION_THREE" : '{{ .Values.openStackPasswordRegionThree }}', - "GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE" : '{{ .Values.openSackMsoEncryptdPasswordRegionThree }}', + "GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD_REGION_THREE" : '{{ .Values.openSackMsoEncryptdPasswordRegionThree }}', "GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD" : '{{ .Values.config.openStackSoEncryptedPassword}}', "GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE" : '{{ .Values.openStackTenantIdRegionThree }}', "GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE" : '{{ .Values.openStackProjectNameRegionThree }}', @@ -205,7 +205,7 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_SDNC_IP_ADDR" : 'sdnc.{{include "common.namespace" .}}', "GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR" : 'sdnc-portal.{{include "common.namespace" .}}', "GLOBAL_INJECTED_SO_APIHAND_IP_ADDR" : 'so.{{include "common.namespace" .}}', - "GLOBAL_INJECTED_SO_ASDCHAND_IP_ADDR" : 'so-sdc-controller.{{include "common.namespace" .}}', + "GLOBAL_INJECTED_SO_SDCHAND_IP_ADDR" : 'so-sdc-controller.{{include "common.namespace" .}}', "GLOBAL_INJECTED_SO_BPMN_IP_ADDR" : 'so-bpmn-infra.{{include "common.namespace" .}}', "GLOBAL_INJECTED_SO_CATDB_IP_ADDR" : 'so-catalog-db-adapter.{{include "common.namespace" .}}', "GLOBAL_INJECTED_SO_IP_ADDR" : 'so.{{include "common.namespace" .}}', |