fail to apply manifests when management ip is missing
Commit to fix bug #1790159 causes retry handler to fail because of mismatched function arguments. Remove 'self' from retry handler and fix error message formatting. Change-Id: Iedeb41451acd0f32b944b49d45f0c4b30a79ebc2 Closes-Bug: #1805678
This commit is contained in:
parent
f03f914ecf
commit
6287c90d49
|
@ -1380,8 +1380,9 @@ class AgentManager(service.PeriodicService):
|
||||||
self._update_config_applied(iconfig_uuid)
|
self._update_config_applied(iconfig_uuid)
|
||||||
self._report_config_applied(context)
|
self._report_config_applied(context)
|
||||||
|
|
||||||
def _retry_on_missing_mgmt_ip(self, exception):
|
def _retry_on_missing_mgmt_ip(ex):
|
||||||
return isinstance(exception, exception.LocalManagementIpNotFound)
|
LOG.info('Caught exception. Retrying... Exception: {}'.format(ex))
|
||||||
|
return isinstance(ex, exception.LocalManagementIpNotFound)
|
||||||
|
|
||||||
@retrying.retry(wait_fixed=15 * 1000, stop_max_delay=300 * 1000,
|
@retrying.retry(wait_fixed=15 * 1000, stop_max_delay=300 * 1000,
|
||||||
retry_on_exception=_retry_on_missing_mgmt_ip)
|
retry_on_exception=_retry_on_missing_mgmt_ip)
|
||||||
|
|
|
@ -1287,8 +1287,8 @@ class InvalidHelmNamespace(Invalid):
|
||||||
|
|
||||||
class LocalManagementIpNotFound(NotFound):
|
class LocalManagementIpNotFound(NotFound):
|
||||||
message = _("Local management IP not found: "
|
message = _("Local management IP not found: "
|
||||||
"config_uuid=%(config_uuid), config_dict=%(config_dict), "
|
"config_uuid=%(config_uuid)s, config_dict=%(config_dict)s, "
|
||||||
"host_personality=%(host_personality)")
|
"host_personality=%(host_personality)s")
|
||||||
|
|
||||||
|
|
||||||
class InvalidHelmDockerImageSource(Invalid):
|
class InvalidHelmDockerImageSource(Invalid):
|
||||||
|
|
Loading…
Reference in New Issue