openstack
/
neutron-lbaas
Code Issues Proposed changes

Mark neutron-lbaas as deprecated 

As of Queens neutron-lbaas is now deprecated.
See the FAQ for more information:
https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation

Change-Id: I54010cea8a8d2c0b510319c454a07da6b06cc9c3
This commit is contained in:
Michael Johnson 2018-01-31 14:33:47 -08:00
parent d024d4262f
commit e4aba85427
17 changed files with 214 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.rst
View File

@ -1,3 +1,7 @@
.. warning::
Neutron-lbaas is now deprecated. Please see the FAQ: https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
New features will not be accepted on this project.
Please see the Neutron CONTRIBUTING.rst file for how to contribute to
neutron-lbaas:

3
README.rst
View File

@ -7,6 +7,9 @@ Team and repository tags
.. Change things from this point on
.. warning::
Neutron-lbaas is now deprecated. Please see the FAQ: https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
Welcome!
========

4
doc/source/index.rst
View File

@ -3,7 +3,9 @@
Neutron LBaaS Documentation
===========================
Under Construction
.. warning::
Neutron-lbaas is now deprecated. Please see the FAQ: https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
Dashboards
==========

11
neutron_lbaas/agent/agent.py
View File

@ -19,16 +19,24 @@ from neutron.common import config as common_config
from neutron.common import rpc as n_rpc
from neutron.conf.agent import common as config
from oslo_config import cfg
from oslo_log import log as logging
from oslo_service import service
from neutron_lbaas._i18n import _
from neutron_lbaas.agent import agent_manager as manager
from neutron_lbaas.services.loadbalancer import constants
LOG = logging.getLogger(__name__)
OPTS = [
cfg.IntOpt(
'periodic_interval',
default=10,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('Seconds between periodic task runs')
)
]
@ -59,6 +67,9 @@ def main():
config.setup_logging()
config.setup_privsep()
LOG.warning('neutron-lbaas is now deprecated. See: '
'https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation')
mgr = manager.LbaasAgentManager(cfg.CONF)
svc = LbaasAgentService(
host=cfg.CONF.host,

5
neutron_lbaas/agent/agent_manager.py
View File

@ -41,6 +41,11 @@ OPTS = [
'device_driver',
default=['neutron_lbaas.drivers.haproxy.'
'namespace_driver.HaproxyNSDriver'],
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('Drivers used to manage loadbalancing devices'),
),
]

10
neutron_lbaas/common/cert_manager/__init__.py
View File

@ -22,10 +22,20 @@ CERT_MANAGER_DEFAULT = 'barbican'
cert_manager_opts = [
cfg.StrOpt('cert_manager_type',
default=CERT_MANAGER_DEFAULT,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org/'
'wiki/Neutron/LBaaS/Deprecation',
help='Certificate Manager plugin. '
'Defaults to {0}.'.format(CERT_MANAGER_DEFAULT)),
cfg.StrOpt('barbican_auth',
default='barbican_acl_auth',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org/'
'wiki/Neutron/LBaaS/Deprecation',
help='Name of the Barbican authentication method to use')
]

5
neutron_lbaas/common/cert_manager/local_cert_manager.py
View File

@ -32,6 +32,11 @@ TLS_STORAGE_DEFAULT = os.environ.get(
local_cert_manager_opts = [
cfg.StrOpt('storage_path',
default=TLS_STORAGE_DEFAULT,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org/'
'wiki/Neutron/LBaaS/Deprecation',
help='Absolute path to the certificate storage directory. '
'Defaults to env[OS_LBAAS_TLS_STORAGE].')
]

70
neutron_lbaas/common/keystone.py
View File

@ -28,69 +28,139 @@ _SESSION = None
OPTS = [
cfg.StrOpt(
'auth_url',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('Authentication endpoint'),
),
cfg.StrOpt(
'admin_user',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
default='admin',
help=_('The service admin user name'),
),
cfg.StrOpt(
'admin_tenant_name',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
default='admin',
help=_('The service admin tenant name'),
),
cfg.StrOpt(
'admin_password',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
secret=True,
default='password',
help=_('The service admin password'),
),
cfg.StrOpt(
'admin_user_domain',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
default='Default',
help=_('The admin user domain name'),
),
cfg.StrOpt(
'admin_project_domain',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
default='Default',
help=_('The admin project domain name'),
),
cfg.StrOpt(
'region',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
default='RegionOne',
help=_('The deployment region'),
),
cfg.StrOpt(
'service_name',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
default='lbaas',
help=_('The name of the service'),
),
cfg.StrOpt(
'auth_version',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
default='3',
help=_('The auth version used to authenticate'),
),
cfg.StrOpt(
'endpoint_type',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
default='public',
help=_('The endpoint_type to be used')
),
cfg.BoolOpt(
'insecure',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
default=False,
help=_('Disable server certificate verification')
),
cfg.StrOpt(
'cafile',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('CA certificate file path')
),
cfg.StrOpt(
'certfile',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('Client certificate cert file path')
),
cfg.StrOpt(
'keyfile',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('Client certificate key file path')
)
]

10
neutron_lbaas/drivers/common/agent_driver_base.py
View File

@ -36,10 +36,20 @@ LB_SCHEDULERS = 'loadbalancer_schedulers'
AGENT_SCHEDULER_OPTS = [
cfg.StrOpt('loadbalancer_scheduler_driver',
default='neutron_lbaas.agent_scheduler.ChanceScheduler',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org/'
'wiki/Neutron/LBaaS/Deprecation',
help=_('Driver to use for scheduling '
'to a default loadbalancer agent')),
cfg.BoolOpt('allow_automatic_lbaas_agent_failover',
default=False,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org'
'/wiki/Neutron/LBaaS/Deprecation',
help=_('Automatically reschedule loadbalancer from offline '
'to online lbaas agents. This is only supported for '
'drivers who use the neutron LBaaSv2 agent')),

5
neutron_lbaas/drivers/haproxy/jinja_cfg.py
View File

@ -65,6 +65,11 @@ JINJA_ENV = None
jinja_opts = [
cfg.StrOpt(
'jinja_config_template',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
default=os.path.join(
TEMPLATES_DIR,
'haproxy.loadbalancer.j2'),

15
neutron_lbaas/drivers/haproxy/namespace_driver.py
View File

@ -51,6 +51,11 @@ OPTS = [
cfg.StrOpt(
'loadbalancer_state_path',
default=STATE_PATH_DEFAULT,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('Location to store config and state files'),
deprecated_opts=[cfg.DeprecatedOpt('loadbalancer_state_path',
group='DEFAULT')],
@ -59,11 +64,21 @@ OPTS = [
'user_group',
default=USER_GROUP_DEFAULT,
help=_('The user group'),
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
deprecated_opts=[cfg.DeprecatedOpt('user_group', group='DEFAULT')],
),
cfg.IntOpt(
'send_gratuitous_arp',
default=3,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('When delete and re-add the same vip, send this many '
'gratuitous ARPs to flush the ARP cache in the Router. '
'Set it below or equal to 0 to disable this feature.'),

20
neutron_lbaas/drivers/octavia/driver.py
View File

@ -38,23 +38,43 @@ OPTS = [
cfg.StrOpt(
'base_url',
default='http://127.0.0.1:9876',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('URL of Octavia controller root'),
),
cfg.IntOpt(
'request_poll_interval',
default=3,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('Interval in seconds to poll octavia when an entity is created,'
' updated, or deleted.')
),
cfg.IntOpt(
'request_poll_timeout',
default=100,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('Time to stop polling octavia when a status of an entity does '
'not change.')
),
cfg.BoolOpt(
'allocates_vip',
default=False,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('True if Octavia will be responsible for allocating the VIP.'
' False if neutron-lbaas will allocate it and pass to Octavia.')
)

5
neutron_lbaas/drivers/octavia/octavia_messaging_consumer.py
View File

@ -23,6 +23,11 @@ from oslo_service import service
oslo_messaging_opts = [
cfg.StrOpt('event_stream_topic',
default='neutron_lbaas_event',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org/'
'wiki/Neutron/LBaaS/Deprecation',
help=_('topic name for receiving events from a queue'))
]

31
neutron_lbaas/extensions/loadbalancerv2.py
View File

@ -418,22 +418,47 @@ SUB_RESOURCE_ATTRIBUTE_MAP = {
lbaasv2_quota_opts = [
cfg.IntOpt('quota_loadbalancer',
default=10,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org/'
'wiki/Neutron/LBaaS/Deprecation',
help=_('Number of LoadBalancers allowed per tenant. '
'A negative value means unlimited.')),
cfg.IntOpt('quota_listener',
default=-1,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org/'
'wiki/Neutron/LBaaS/Deprecation',
help=_('Number of Loadbalancer Listeners allowed per tenant. '
'A negative value means unlimited.')),
cfg.IntOpt('quota_pool',
default=10,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org/'
'wiki/Neutron/LBaaS/Deprecation',
help=_('Number of pools allowed per tenant. '
'A negative value means unlimited.')),
cfg.IntOpt('quota_member',
default=-1,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org/'
'wiki/Neutron/LBaaS/Deprecation',
help=_('Number of pool members allowed per tenant. '
'A negative value means unlimited.')),
cfg.IntOpt('quota_healthmonitor',
default=-1,
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now '
'deprecated. See: https://wiki.openstack.org/'
'wiki/Neutron/LBaaS/Deprecation',
help=_('Number of health monitors allowed per tenant. '
'A negative value means unlimited.'))
]
@ -452,11 +477,11 @@ class Loadbalancerv2(api_extensions.ExtensionDescriptor):
@classmethod
def get_description(cls):
return "Extension for LoadBalancing service v2"
return "Extension for LoadBalancing service v2 (deprecated)"
@classmethod
def get_updated(cls):
return "2014-06-18T10:00:00-00:00"
return "2018-01-31T10:00:00-00:00"
@classmethod
def get_resources(cls):
@ -523,7 +548,7 @@ class LoadBalancerPluginBaseV2(service_base.ServicePluginBase):
return constants.LOADBALANCERV2
def get_plugin_description(self):
return 'LoadBalancer service plugin v2'
return 'LoadBalancer service plugin v2 (deprecated)'
@abc.abstractmethod
def get_loadbalancers(self, context, filters=None, fields=None):

3
neutron_lbaas/services/loadbalancer/plugin.py
View File

@ -80,6 +80,9 @@ class LoadBalancerPluginv2(loadbalancerv2.LoadBalancerPluginBaseV2,
def __init__(self):
"""Initialization for the loadbalancer service plugin."""
LOG.warning('neutron-lbaas is now deprecated. See: '
'https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation')
self.db = ldbv2.LoadBalancerPluginDbv2()
self.service_type_manager = st_db.ServiceTypeManager.get_instance()
add_provider_configuration(

8
neutron_lbaas/services/loadbalancer/proxy_plugin.py
View File

@ -48,6 +48,11 @@ OPTS = [
cfg.StrOpt(
'base_url',
default='http://127.0.0.1:9876',
deprecated_for_removal=True,
deprecated_since='Queens',
deprecated_reason='The neutron-lbaas project is now deprecated. '
'See: https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation',
help=_('URL of Octavia controller root'),
),
]
@ -78,6 +83,9 @@ class LoadBalancerProxyPluginv2(loadbalancerv2.LoadBalancerPluginBaseV2):
path_prefix = loadbalancerv2.LOADBALANCERV2_PREFIX
def __init__(self):
LOG.warning('neutron-lbaas is now deprecated. See: '
'https://wiki.openstack.org/wiki/Neutron/LBaaS/'
'Deprecation')
self.service_type_manager = st_db.ServiceTypeManager.get_instance()
add_provider_configuration(
self.service_type_manager, constants.LOADBALANCERV2)

9
releasenotes/notes/neutron-lbaas-deprecation-cab9d60ecf902909.yaml Normal file
View File

@ -0,0 +1,9 @@
---
prelude: >
As of the Queens release, neutron-lbaas is now deprecated and being
replaced by the octavia project. Please see the FAQ for more
information: https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
deprecations:
- |
The neutron-lbaas project is now deprecated. Please see the FAQ for more
information: https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation