Skip to content

Support Kilo #1367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhaoqin-github wants to merge 1 commit into
base: support-kilo
Choose a base branch
from
Open

Support Kilo #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions f5_openstack_agent/lbaasv2/drivers/bigip/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
import f5_openstack_agent.lbaasv2.drivers.bigip.exceptions as exceptions

try:
from neutron.openstack.common import service
from oslo_config import cfg
from oslo_log import log as oslo_logging
from oslo_service import service
except ImportError as CriticalError:
frame = inspect.getframeinfo(inspect.currentframe())
CriticalError = \
Expand Down Expand Up @@ -87,7 +87,7 @@ def main():
topic=f5constants.TOPIC_LOADBALANCER_AGENT_V2,
manager=mgr
)
service.launch(cfg.CONF, svc).wait()
service.launch(svc).wait()


if __name__ == '__main__':
Expand Down
6 changes: 3 additions & 3 deletions f5_openstack_agent/lbaasv2/drivers/bigip/agent_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
import sys
import uuid

from neutron.openstack.common import loopingcall
from neutron.openstack.common import periodic_task
from oslo_config import cfg
from oslo_log import helpers as log_helpers
from oslo_log import log as logging
import oslo_messaging
from oslo_service import loopingcall
from oslo_service import periodic_task
from oslo_utils import importutils

from neutron.agent import rpc as agent_rpc
Expand Down Expand Up @@ -228,7 +228,7 @@ class LbaasAgentManager(periodic_task.PeriodicTasks): # b --> B

def __init__(self, conf):
"""Initialize LbaasAgentManager."""
super(LbaasAgentManager, self).__init__(conf)
super(LbaasAgentManager, self).__init__()
LOG.debug("Initializing LbaasAgentManager")
LOG.debug("runtime environment: %s" % sys.version)

Expand Down