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

[fix] flake8

Browse Source
This commit is contained in:
Dominique Quatravaux
2020-10-29 13:14:59 +01:00
parent 3335ea953e
commit 87b97530ff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/scheduler/kubernetes.py
View File

@@ -21,7 +21,7 @@ def deepmerge(a, b):
""" """
if isinstance(a, dict) and isinstance(b, dict): if isinstance(a, dict) and isinstance(b, dict):
return dict([(k, deepmerge(a.get(k), b.get(k))) return dict([(k, deepmerge(a.get(k), b.get(k)))
for k in set(a.keys()).union(b.keys())]) for k in set(a.keys()).union(b.keys())])
elif b is None: elif b is None:
return a return a
else: else:
@@ -150,7 +150,7 @@ class PodManager(object):
labels={ labels={
'ansible-awx': settings.INSTALL_UUID, 'ansible-awx': settings.INSTALL_UUID,
'ansible-awx-job-id': str(self.task.id) 'ansible-awx-job-id': str(self.task.id)
})) }))
pod_spec['spec']['containers'][0]['name'] = self.pod_name pod_spec['spec']['containers'][0]['name'] = self.pod_name
return pod_spec return pod_spec