Update Higgins compute agent with Zun

As we are renaming Higgins to Zun, we need to update
higgins compute agent to zun compute agent.

Change-Id: I5be3c9cbfa5b066bc76fbddeac4ad0679a751453
This commit is contained in:
Wenzhi Yu 2016-06-10 13:56:21 +08:00
parent c0ca5944da
commit ff27a8dd53
5 changed files with 12 additions and 12 deletions

View File

@ -19,22 +19,22 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_service import service
from higgins.common import rpc_service
from higgins.common import service as higgins_service
from higgins.common import short_id
from higgins.compute import manager as compute_manager
from higgins.i18n import _LI
from zun.common import rpc_service
from zun.common import service as zun_service
from zun.common import short_id
from zun.compute import manager as compute_manager
from zun.i18n import _LI
LOG = logging.getLogger(__name__)
def main():
higgins_service.prepare_service(sys.argv)
zun_service.prepare_service(sys.argv)
LOG.info(_LI('Starting server in PID %s'), os.getpid())
cfg.CONF.log_opt_values(LOG, logging.DEBUG)
cfg.CONF.import_opt('topic', 'higgins.compute.config', group='compute')
cfg.CONF.import_opt('topic', 'zun.compute.config', group='compute')
compute_id = short_id.generate_id()
endpoints = [
@ -42,6 +42,6 @@ def main():
]
server = rpc_service.Service.create(cfg.CONF.compute.topic, compute_id,
endpoints, binary='higgins-compute')
endpoints, binary='zun-compute')
launcher = service.launch(cfg.CONF, server)
launcher.wait()

View File

@ -14,7 +14,7 @@
from oslo_config import cfg
from higgins.common import rpc_service
from zun.common import rpc_service
class API(rpc_service.API):
@ -28,7 +28,7 @@ class API(rpc_service.API):
def __init__(self, transport=None, context=None, topic=None):
if topic is None:
cfg.CONF.import_opt(
'topic', 'higgins.compute.config', group='compute')
'topic', 'zun.compute.config', group='compute')
super(API, self).__init__(
transport, context, topic=cfg.CONF.compute.topic)

View File

@ -17,11 +17,11 @@ from oslo_config import cfg
SERVICE_OPTS = [
cfg.StrOpt(
'topic',
default='higgins-compute',
default='zun-compute',
help='The queue to add compute tasks to.'),
]
opt_group = cfg.OptGroup(
name='compute', title='Options for the higgins-compute service')
name='compute', title='Options for the zun-compute service')
cfg.CONF.register_group(opt_group)
cfg.CONF.register_opts(SERVICE_OPTS, opt_group)