Retreive Location information from new environment variables

Change-Id: Ifb075af88489ef85e45de001a495723f5443ad94

ranger-agent/templates/bin/_add-region.py.tpl

@@ -81,6 +81,16 @@ def build_payload():
         payload['name'] = os.environ['OS_REGION_NAME']
         payload['vlcpName'] = os.environ['OS_REGION_NAME']
 
+        payload['address'] = {
+            "street": os.environ['LOCATION_ADDRESS'],
+            "city": os.environ['LOCATION_NAME'],
+            "state": os.environ['LOCATION_STATE'],
+            "zip": os.environ['LOCATION_ZIP'],
+            "country": os.environ['LOCATION_COUNTRY']}
+
+        payload['CLLI'] = os.environ['LOCATION_ID']
+        payload['locationType'] = os.environ['LOCATION_ID']
+
         description = "Automatic creation of Region %s" % os.environ['OS_REGION_NAME']
         payload['description'] = description
 

ranger-agent/templates/job-add-region.yaml

@@ -50,6 +50,18 @@ spec:
           env:
             - name: PARAMETERS
               value: {{ .Values.conf.region.parameters | quote }}
+            - name: LOCATION_ADDRESS
+              value: {{ default "TBD" .Values.conf.region.location.address | quote }}
+            - name: LOCATION_NAME
+              value: {{ default "TBD" .Values.conf.region.location.name | quote }}
+            - name: LOCATION_STATE
+              value: {{ default "TBD" .Values.conf.region.location.state | quote }}
+            - name: LOCATION_ZIP
+              value: {{ default "TBD" .Values.conf.region.location.zip | quote }}
+            - name: LOCATION_COUNTRY
+              value: {{ default "TBD" .Values.conf.region.location.country | quote }}
+            - name: LOCATION_ID
+              value: {{ default "TBD" .Values.conf.region.location.location_physical_location_id | quote }}
             - name: DASHBOARD_ENDPOINT
               value: {{ tuple "dashboard" "public" "web" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix "/" }}
             - name: IDENTITY_ENDPOINT

ranger-agent/values.yaml

@@ -595,8 +595,8 @@ conf:
     expected_end_status_key: Success
   region:
     parameters: |-
-      { "rangerAgentVersion": "1.0",
-        "OSVersion": "Ubuntu18.04"
+      { "rangerAgentVersion": "2.0",
+        "OSVersion": "Stein"
       }
     rms_listener_endpoint: http://localhost:7003/v2/orm/regions