diff options
Diffstat (limited to 'kubernetes/so')
| -rwxr-xr-x | kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml | 26 | ||||
| -rwxr-xr-x | kubernetes/so/charts/so-openstack-adapter/values.yaml | 7 |
2 files changed, 27 insertions, 6 deletions
diff --git a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml index c0f7851103..f7e9e47947 100755 --- a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml @@ -16,8 +16,8 @@ server: spring: datasource: url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb - username: ${DB_USERNAME} - password: ${DB_PASSWORD} + username: ${DB_ADMIN_USERNAME} + password: ${DB_ADMIN_PASSWORD} driver-class-name: org.mariadb.jdbc.Driver dbcp2: initial-size: 5 @@ -112,11 +112,20 @@ cloud_config: identity_url: "https://identity.api.rackspacecloud.com/v2.0" mso_id: "RACKSPACE_ACCOUNT_ID" mso_pass: "RACKSPACE_ACCOUNT_APIKEY" - admin_tenant: "service" + admin_tenant: "{{ .Values.config.openStackServiceTenantName }}" member_role: "admin" tenant_metadata: true identity_server_type: "KEYSTONE" identity_authentication_type: "RACKSPACE_APIKEY" + DEFAULT_KEYSTONE: + identity_url: "{{ .Values.config.openStackKeyStoneUrl }}" + mso_id: "{{ .Values.config.openStackUserName }}" + mso_pass: "{{ .Values.config.openStackEncryptedPasswordHere }}" + admin_tenant: "{{ .Values.config.openStackServiceTenantName }}" + member_role: "admin" + tenant_metadata: true + identity_server_type: "KEYSTONE" + identity_authentication_type: "USERNAME_PASSWORD" cloud_sites: Dallas: region_id: "DFW" @@ -133,8 +142,13 @@ cloud_config: clli: "ORD" aic_version: "2.5" identity_service_id: "RAX_KEYSTONE" + RegionOne: + region_id: "RegionOne" + clli: "RegionOne" + aic_version: "2.5" + identity_service_id: "DEFAULT_KEYSTONE" DEFAULT: - region_id: "DFW" - clli: "DFW" + region_id: "{{ .Values.config.openStackRegion }}" + clli: "{{ .Values.config.openStackRegion }}" aic_version: "2.5" - identity_service_id: "RAX_KEYSTONE" + identity_service_id: "DEFAULT_KEYSTONE" diff --git a/kubernetes/so/charts/so-openstack-adapter/values.yaml b/kubernetes/so/charts/so-openstack-adapter/values.yaml index 867e599202..f30de2799f 100755 --- a/kubernetes/so/charts/so-openstack-adapter/values.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml @@ -57,6 +57,13 @@ livenessProbe: failureThreshold: 3 ingress: enabled: false +config: + openStackUserName: "vnf_user" + openStackRegion: "RegionOne" + openStackKeyStoneUrl: "http://1.2.3.4:5000/v2.0" + openStackServiceTenantName: "service" + openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e" + openStackTenantId: "d570c718cbc545029f40e50b75eb13df" nodeSelector: {} tolerations: [] affinity: {} |