From a531b85b31f71df1538e32a20ec8236eca3cb67d Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 23 Apr 2020 15:32:14 -0400 Subject: [PATCH] Redo waiting until Project updates are complete --- awxkit/awxkit/api/pages/api.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index 75dbe26bce..218bc81658 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -195,9 +195,14 @@ class ApiV2(base.Base): # We should only impose a default password if the resource doesn't exist. post_data.setdefault('password', 'abc123') _page = endpoint.post(post_data) + if asset['natural_key']['type'] == 'project': + # When creating a project, we need to wait for its + # first project update to finish so that associated + # JTs have valid options for playbook names + _page.wait_until_completed() else: _page = _page.put(post_data) - except exc.Common as e: + except (exc.Common, AssertionError) as e: log.error("Object import failed: %s.", e) log.debug("post_data: %r", post_data) continue