Merge pull request #5922 from jakemcdermott/fix-4095

Use pod uid as instance uuid

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

installer/roles/kubernetes/templates/configmap.yml.j2

@@ -144,7 +144,7 @@ data:
 
     #Autoprovisioning should replace this
     CLUSTER_HOST_ID = socket.gethostname()
-    SYSTEM_UUID = '00000000-0000-0000-0000-000000000000'
+    SYSTEM_UUID = os.environ.get('MY_POD_UID', '00000000-0000-0000-0000-000000000000')
 
     SESSION_COOKIE_SECURE = False
     CSRF_COOKIE_SECURE = False

installer/roles/kubernetes/templates/deployment.yml.j2

@@ -285,6 +285,10 @@ spec:
           env:
             - name: AWX_SKIP_MIGRATIONS
               value: "1"
+            - name: MY_POD_UID
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.uid
           resources:
             requests:
               memory: "{{ task_mem_request }}Gi"