rename neutron/agent to tacker

Change-Id: I01585c56716ce1469ed479c53b17c9f8fb245011
changes/20/104820/1
Isaku Yamahata 9 years ago
parent 380dcf445d
commit 28bd56f146

@ -19,8 +19,8 @@ import os
from oslo.config import cfg
from neutron.common import config
from neutron.openstack.common import log as logging
from tacker.common import config
from tacker.openstack.common import log as logging
LOG = logging.getLogger(__name__)
@ -111,7 +111,7 @@ def get_root_helper(conf):
def setup_conf():
bind_opts = [
cfg.StrOpt('state_path',
default='/var/lib/neutron',
default='/var/lib/tacker',
help=_('Top-level directory for maintaining dhcp state')),
]

@ -18,8 +18,8 @@ import eventlet
import eventlet.event
import eventlet.queue
from neutron.agent.linux import utils
from neutron.openstack.common import log as logging
from tacker.agent.linux import utils
from tacker.openstack.common import log as logging
LOG = logging.getLogger(__name__)
@ -131,7 +131,7 @@ class AsyncProcess(object):
# If root helper was used, two or more processes will be created:
#
# - a root helper process (e.g. sudo myscript)
# - possibly a rootwrap script (e.g. neutron-rootwrap)
# - possibly a rootwrap script (e.g. tacker-rootwrap)
# - a child process (e.g. myscript)
#
# Killing the root helper process will leave the child process

@ -22,7 +22,7 @@ import os
import signal
import sys
from neutron.openstack.common import log as logging
from tacker.openstack.common import log as logging
LOG = logging.getLogger(__name__)

@ -20,9 +20,9 @@ import os
from oslo.config import cfg
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.openstack.common import log as logging
from tacker.agent.linux import ip_lib
from tacker.agent.linux import utils
from tacker.openstack.common import log as logging
LOG = logging.getLogger(__name__)
@ -36,7 +36,7 @@ cfg.CONF.register_opts(OPTS)
class ProcessManager(object):
"""An external process manager for Neutron spawned processes.
"""An external process manager for Tacker spawned processes.
Note: The manager expects uuid to be in cmdline.
"""

@ -21,14 +21,14 @@ import netaddr
from oslo.config import cfg
import six
from neutron.agent.common import config
from neutron.agent.linux import ip_lib
from neutron.agent.linux import ovs_lib
from neutron.agent.linux import utils
from neutron.common import exceptions
from neutron.extensions import flavor
from neutron.openstack.common import importutils
from neutron.openstack.common import log as logging
from tacker.agent.common import config
from tacker.agent.linux import ip_lib
from tacker.agent.linux import ovs_lib
from tacker.agent.linux import utils
from tacker.common import exceptions
from tacker.extensions import flavor
from tacker.openstack.common import importutils
from tacker.openstack.common import log as logging
LOG = logging.getLogger(__name__)
@ -394,8 +394,8 @@ class BridgeInterfaceDriver(LinuxInterfaceDriver):
class MetaInterfaceDriver(LinuxInterfaceDriver):
def __init__(self, conf):
super(MetaInterfaceDriver, self).__init__(conf)
from neutronclient.v2_0 import client
self.neutron = client.Client(
from tackerclient.v2_0 import client
self.tacker = client.Client(
username=self.conf.admin_user,
password=self.conf.admin_password,
tenant_name=self.conf.admin_tenant_name,
@ -411,7 +411,7 @@ class MetaInterfaceDriver(LinuxInterfaceDriver):
self.flavor_driver_map[net_flavor] = self._load_driver(driver_name)
def _get_flavor_by_network_id(self, network_id):
network = self.neutron.show_network(network_id)
network = self.tacker.show_network(network_id)
return network['network'][flavor.FLAVOR_NETWORK]
def _get_driver_by_network_id(self, network_id):

@ -17,8 +17,8 @@
import netaddr
from oslo.config import cfg
from neutron.agent.linux import utils
from neutron.common import exceptions
from tacker.agent.linux import utils
from tacker.common import exceptions
OPTS = [

@ -18,8 +18,8 @@ import contextlib
import eventlet
from neutron.agent.linux import ovsdb_monitor
from neutron.plugins.openvswitch.common import constants
from tacker.agent.linux import ovsdb_monitor
from tacker.plugins.openvswitch.common import constants
@contextlib.contextmanager

@ -27,9 +27,9 @@ import tempfile
from eventlet.green import subprocess
from eventlet import greenthread
from neutron.common import utils
from neutron.openstack.common import excutils
from neutron.openstack.common import log as logging
from tacker.common import utils
from tacker.openstack.common import excutils
from tacker.openstack.common import log as logging
LOG = logging.getLogger(__name__)

@ -17,11 +17,11 @@
import itertools
from neutron.common import rpc_compat
from neutron.common import topics
from tacker.common import rpc_compat
from tacker.common import topics
from neutron.openstack.common import log as logging
from neutron.openstack.common import timeutils
from tacker.openstack.common import log as logging
from tacker.openstack.common import timeutils
LOG = logging.getLogger(__name__)
Loading…
Cancel
Save