Merge "Add KURYR_K8S_LBAAS_USE_OCTAVIA=False to LBaaS job"
This commit is contained in:
commit
c13bcb16e6
|
@ -24,6 +24,7 @@
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
NEUTRON_LBAAS_SERVICE_PROVIDERV2: 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default'
|
NEUTRON_LBAAS_SERVICE_PROVIDERV2: 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default'
|
||||||
|
KURYR_K8S_LBAAS_USE_OCTAVIA: False
|
||||||
devstack_services:
|
devstack_services:
|
||||||
q-lbaasv2: true
|
q-lbaasv2: true
|
||||||
|
|
||||||
|
|
|
@ -308,7 +308,6 @@ function create_k8s_subnet {
|
||||||
# another service
|
# another service
|
||||||
function create_k8s_router_fake_service {
|
function create_k8s_router_fake_service {
|
||||||
local router_ip
|
local router_ip
|
||||||
local existing_svc_ip
|
|
||||||
local fake_svc_name
|
local fake_svc_name
|
||||||
|
|
||||||
fake_svc_name='kuryr-svc-router'
|
fake_svc_name='kuryr-svc-router'
|
||||||
|
@ -323,8 +322,8 @@ function create_k8s_router_fake_service {
|
||||||
# Description: Creates an endpoint-less kubernetes service to keep Kubernetes
|
# Description: Creates an endpoint-less kubernetes service to keep Kubernetes
|
||||||
# API server from allocating this IP for another service
|
# API server from allocating this IP for another service
|
||||||
function create_k8s_fake_service {
|
function create_k8s_fake_service {
|
||||||
local svc_name
|
local fake_svc_name
|
||||||
local svc_ip
|
local fake_svc_ip
|
||||||
|
|
||||||
fake_svc_name="$1"
|
fake_svc_name="$1"
|
||||||
fake_svc_ip="$2"
|
fake_svc_ip="$2"
|
||||||
|
|
Loading…
Reference in New Issue