Merge "Conductor waits for registration agent."
This commit is contained in:
commit
bc736c3fdf
|
@ -86,6 +86,11 @@ class ConductorManager(object):
|
|||
|
||||
ragent = self.dbapi.get_registration_wampagent()
|
||||
|
||||
while not ragent:
|
||||
LOG.warn("Cannot find a registration agent. Waiting for it...")
|
||||
time.sleep(5)
|
||||
ragent = self.dbapi.get_registration_wampagent()
|
||||
|
||||
LOG.info("Found registration agent: %s on %s",
|
||||
ragent.hostname, ragent.wsurl)
|
||||
|
||||
|
|
|
@ -585,7 +585,7 @@ class Connection(api.Connection):
|
|||
.filter_by(ragent=True, online=True)
|
||||
.one())
|
||||
except NoResultFound:
|
||||
raise exception.WampRegistrationAgentNotFound()
|
||||
return None
|
||||
|
||||
def unregister_wampagent(self, hostname):
|
||||
session = get_session()
|
||||
|
|
Loading…
Reference in New Issue