Use OS_REGION_NAME rendered in from secret

Change-Id: I3c4b9724c51a6bcd26f56ba38ef73f03538b7b8a
This commit is contained in:
Chi Lo 2020-03-13 09:11:38 -07:00
parent f098b84f68
commit ae112cb50b
2 changed files with 4 additions and 6 deletions

View File

@ -77,11 +77,11 @@ def build_payload():
payload = json.loads(parameters)
payload['status'] = "functional"
payload['id'] = os.environ['REGION']
payload['name'] = os.environ['REGION']
payload['vlcpName'] = os.environ['REGION']
payload['id'] = os.environ['OS_REGION_NAME']
payload['name'] = os.environ['OS_REGION_NAME']
payload['vlcpName'] = os.environ['OS_REGION_NAME']
description = "Automatic creation of Region %s" % os.environ['REGION']
description = "Automatic creation of Region %s" % os.environ['OS_REGION_NAME']
payload['description'] = description
payload['endpoints'] = [

View File

@ -50,8 +50,6 @@ spec:
env:
- name: PARAMETERS
value: {{ .Values.conf.region.parameters | quote }}
- name: REGION
value: {{ .Values.conf.ranger_agent.DEFAULT.region }}
- name: DASHBOARD_ENDPOINT
value: {{ tuple "dashboard" "public" "web" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix "/" }}
- name: IDENTITY_ENDPOINT