From 96c34a780fd3f504ea1bef671cc3ed1d9f6bc2ef Mon Sep 17 00:00:00 2001 From: Doug Wiegley Date: Fri, 12 Dec 2014 19:20:47 -0700 Subject: [PATCH] Minor lbaasv2 things from the feature branch, needed in neutron - Minor neutron.conf fix from feature branch until config is moved - Some extra constants for extension - Jinja template entry in services.conf Change-Id: I4a15d0ac422457d2286d4b24d9f5067047e81563 Partially-Implements: blueprint services-split Co-Authored-By: Brandon Logan --- etc/neutron.conf | 12 +++++++++++- etc/services.conf | 3 +++ neutron/plugins/common/constants.py | 5 ++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/etc/neutron.conf b/etc/neutron.conf index e1c2cc258..623456c31 100644 --- a/etc/neutron.conf +++ b/etc/neutron.conf @@ -527,6 +527,16 @@ lock_path = $state_path/lock # and that is the reason why quota is possible. # quota_health_monitor = -1 +# Number of loadbalancers allowed per tenant. A negative value means unlimited. +# quota_loadbalancer = 10 + +# Number of listeners allowed per tenant. A negative value means unlimited. +# quota_listener = -1 + +# Number of v2 health monitors allowed per tenant. A negative value means +# unlimited. These health monitors exist under the lbaas v2 API +# quota_healthmonitor = -1 + # Number of routers allowed per tenant. A negative value means unlimited. # quota_router = 10 @@ -643,4 +653,4 @@ service_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec. # Uncomment the line below to use the A10 Networks LBaaS driver. Requires 'pip install a10-neutron-lbaas'. # service_provider = LOADBALANCER:A10Networks:neutron_lbaas.services.loadbalancer.drivers.a10networks.driver_v1.ThunderDriver:default # Uncomment the following line to test the LBaaS v2 API _WITHOUT_ a real backend -# service_provider = LOADBALANCER:LoggingNoop:neutron_lbaas.services.loadbalancer.drivers.logging_noop.driver.LoggingNoopLoadBalancerDriver:default +# service_provider = LOADBALANCERV2:LoggingNoop:neutron_lbaas.services.loadbalancer.drivers.logging_noop.driver.LoggingNoopLoadBalancerDriver:default diff --git a/etc/services.conf b/etc/services.conf index f8a609005..262c12082 100644 --- a/etc/services.conf +++ b/etc/services.conf @@ -38,3 +38,6 @@ #async_requests = #lb_flavor = small #sync_interval = 60 + +[haproxy] +#jinja_config_template = /opt/stack/neutron/neutron/services/drivers/haproxy/templates/haproxy_v1.4.template diff --git a/neutron/plugins/common/constants.py b/neutron/plugins/common/constants.py index 10d2902d8..e32738fa7 100644 --- a/neutron/plugins/common/constants.py +++ b/neutron/plugins/common/constants.py @@ -17,6 +17,7 @@ CORE = "CORE" DUMMY = "DUMMY" LOADBALANCER = "LOADBALANCER" +LOADBALANCERV2 = "LOADBALANCERV2" FIREWALL = "FIREWALL" VPN = "VPN" METERING = "METERING" @@ -27,6 +28,7 @@ L3_ROUTER_NAT = "L3_ROUTER_NAT" EXT_TO_SERVICE_MAPPING = { 'dummy': DUMMY, 'lbaas': LOADBALANCER, + 'lbaasv2': LOADBALANCERV2, 'fwaas': FIREWALL, 'vpnaas': VPN, 'metering': METERING, @@ -35,12 +37,13 @@ EXT_TO_SERVICE_MAPPING = { # TODO(salvatore-orlando): Move these (or derive them) from conf file ALLOWED_SERVICES = [CORE, DUMMY, LOADBALANCER, FIREWALL, VPN, METERING, - L3_ROUTER_NAT] + L3_ROUTER_NAT, LOADBALANCERV2] COMMON_PREFIXES = { CORE: "", DUMMY: "/dummy_svc", LOADBALANCER: "/lb", + LOADBALANCERV2: "/lbaas", FIREWALL: "/fw", VPN: "/vpn", METERING: "/metering", -- 2.45.2