Skip to content

Commit ab931c9

Browse files
author
Marian Ganisin
authored
Merge branch 'master' into retry_wait_for_tenant
2 parents 046c7b6 + dfbd6b7 commit ab931c9

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

threescale_api/client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ def wait_for_tenant(self) -> bool:
7575
and len(self.accounts.list()) >= 1 \
7676
and self.services.exists() \
7777
and len(self.services.list()) >= 1
78-
except Exception:
78+
except Exception as err:
79+
log.info("wait_for_tenant failed: %s", err)
7980
return False
8081

8182
@property

threescale_api/resources.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,9 @@ def wait_tenant_ready(self) -> bool:
11101110
"""
11111111
When True is returned, there is some chance the tenant is actually ready.
11121112
"""
1113-
return self.admin_api().wait_for_tenant()
1113+
# Ignore ssl, this is about checking whether the initialization has
1114+
# been finished.
1115+
return self.admin_api(ssl_verify=False).wait_for_tenant()
11141116

11151117
def admin_api(self, ssl_verify=True, wait=-1) -> 'client.ThreeScaleClient':
11161118
"""

0 commit comments

Comments
 (0)