openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Add KURYR_K8S_LBAAS_USE_OCTAVIA=False to LBaaS job"

This commit is contained in:
Zuul 2018-07-02 14:45:30 +00:00 committed by Gerrit Code Review
parent fcadf5eeb2 d43c478f40
commit c13bcb16e6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.d/lbaasv2.yaml
View File

@ -24,6 +24,7 @@
vars:
devstack_localrc:
NEUTRON_LBAAS_SERVICE_PROVIDERV2: 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default'
KURYR_K8S_LBAAS_USE_OCTAVIA: False
devstack_services:
q-lbaasv2: true

5
devstack/lib/kuryr_kubernetes
View File

@ -308,7 +308,6 @@ function create_k8s_subnet {
# another service
function create_k8s_router_fake_service {
local router_ip
local existing_svc_ip
local fake_svc_name
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
# API server from allocating this IP for another service
function create_k8s_fake_service {
local svc_name
local svc_ip
local fake_svc_name
local fake_svc_ip
fake_svc_name="$1"
fake_svc_ip="$2"