From 3831efb3be313fb51dbaaebc194d0c7e055cacbf Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Wed, 12 Feb 2020 13:48:20 -0500 Subject: [PATCH] Use pod uid as instance uuid Inject the pod uid as an environment variable and use it for the SYSTEM_UUID in the settings file defined by the configmap. --- installer/roles/kubernetes/templates/configmap.yml.j2 | 2 +- installer/roles/kubernetes/templates/deployment.yml.j2 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/installer/roles/kubernetes/templates/configmap.yml.j2 b/installer/roles/kubernetes/templates/configmap.yml.j2 index f3edd6769e..927aaedc58 100644 --- a/installer/roles/kubernetes/templates/configmap.yml.j2 +++ b/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 diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2 index 52763b911a..264dd31ea2 100644 --- a/installer/roles/kubernetes/templates/deployment.yml.j2 +++ b/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"