openstack
/
fuel-library
Code Issues Proposed changes

Make Neutron L3/DHCP agents OCF script more tolerant 

to mysql and keystone temporary fails.

Change-Id: Iaf5d5b49932c1dc4db6bca0563607972150f4cf4
Closes-bug: #1287716
This commit is contained in:
Sergey Vasilenko 2014-03-04 18:42:20 +04:00 committed by Dmitry Borodaenko
parent b8f8476345
commit 73313007c0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/neutron/files/q-agent-cleanup.py
View File

@ -96,6 +96,7 @@ class NeutronCleaner(object):
errmsg = e.message.strip()
if re.search(r"Connection\s+refused$", errmsg, re.I) or \
re.search(r"Connection\s+timed\s+out$", errmsg, re.I) or\
re.search(r"Lost\s+connection\s+to\s+MySQL\s+server", errmsg, re.I) or\
re.search(r"Service\s+Unavailable$", errmsg, re.I) or\
re.search(r"'*NoneType'*\s+object\s+has\s+no\s+attribute\s+'*__getitem__'*$", errmsg, re.I) or \
re.search(r"No\s+route\s+to\s+host$", errmsg, re.I):
@ -125,6 +126,7 @@ class NeutronCleaner(object):
errmsg = e.message.strip()
if re.search(r"Connection\s+refused", errmsg, re.I) or\
re.search(r"Connection\s+timed\s+out", errmsg, re.I) or\
re.search(r"Lost\s+connection\s+to\s+MySQL\s+server", errmsg, re.I) or\
re.search(r"503\s+Service\s+Unavailable", errmsg, re.I) or\
re.search(r"No\s+route\s+to\s+host", errmsg, re.I):
self.log.info("Can't connect to {0}, wait for server ready...".format(self.keystone.service_catalog.url_for(service_type='network')))