Charm-helpers sync to pull in service_running fix

Change-Id: I45f6d54cc1c3271d08314ee7c6e1bbd0237fc5cf
Closes-Bug: 1581171
This commit is contained in:
David Ames 2016-05-13 09:48:45 -07:00
parent 4b9d9ad781
commit 421e3ee1cd
3 changed files with 6 additions and 1 deletions

View File

@ -149,6 +149,7 @@ PACKAGE_CODENAMES = {
'neutron-common': OrderedDict([
('7.0', 'liberty'),
('8.0', 'mitaka'),
('8.1', 'mitaka'),
]),
'cinder-common': OrderedDict([
('7.0', 'liberty'),

View File

@ -615,7 +615,7 @@ def pool_exists(service, name):
except CalledProcessError:
return False
return name in out
return name in out.split()
def get_osds(service):

View File

@ -152,6 +152,10 @@ def service_running(service_name):
if ("start/running" in output or "is running" in output or
"up and running" in output):
return True
# Actively check for upstart stopped message(s) as the fall through
# SystemV check can return false positives
if ("stop/waiting" in output):
return False
# Check System V scripts init script return codes
if service_name in systemv_services_running():
return True