External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 14:39:30 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5922 from jakemcdermott/fix-4095

Browse Source 
Use pod uid as instance uuid

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-02-13 16:11:35 +00:00
committed by GitHub
parent 73a9541e39 3831efb3be
commit af4e4b4064
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/roles/kubernetes/templates/configmap.yml.j2
View File

@@ -144,7 +144,7 @@ data:
#Autoprovisioning should replace this #Autoprovisioning should replace this
CLUSTER_HOST_ID = socket.gethostname() 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 SESSION_COOKIE_SECURE = False
CSRF_COOKIE_SECURE = False CSRF_COOKIE_SECURE = False

4
installer/roles/kubernetes/templates/deployment.yml.j2
View File

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