x
/
anvil
Code Issues Proposed changes

Relabel the program name for keystone-all -> keystone 

Make sure the subsystem 'all' maps to the right service name.

Fixes bug: 1244579

Change-Id: Ie14c5b00ce0e7aedacff8e322283bf256038771d
This commit is contained in:
Joshua Harlow 2013-10-28 12:17:58 -07:00
parent aa9f00d8cb
commit 00e6e30849
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
anvil/components/keystone.py
View File

@ -108,6 +108,13 @@ class KeystoneRuntime(bruntime.OpenStackRuntime):
bruntime.OpenStackRuntime.__init__(self, *args, **kargs)
self.init_fn = sh.joinpths(self.get_option('trace_dir'), INIT_WHAT_HAPPENED)
def daemon_name(self, program):
# NOTE(harlowja): 'all' just runs the keystone service due to change in service
# name from 'all' to without the '-all' part, so we need to reflect that here.
if program in ('all',):
return "openstack-%s" % (self.name)
return super(KeystoneRuntime, self).daemon_name(program)
def post_start(self):
if not sh.isfile(self.init_fn) and self.get_bool_option('do-init'):
self.wait_active()