openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Add KURYR_K8S_LBAAS_USE_OCTAVIA=False to LBaaS job 

Turns out in plugin.sh we're depending from aformentioned variable being
set. It defaults to True, so when it wasn't set for LBaaS v2 jobs, we've
ended up not doing some of the stuff we should, e.g. creating a K8s
Service for Neutron router IP.

This commit fixes that as well as some minor issues in code creating the
Service for Neutron router IP. Please note that while it might have been
useful to just switch to use `is_service_enabled q-lbaasv2`, we're in
the process of deprecation of LBaaS v2 support, so I decided to just fix
it the easy way.

Change-Id: If962d9df8780ed342e6658d2d9939863ea7e6ed3
Closes-Bug: 1779312
This commit is contained in:
Michał Dulko 2018-07-02 14:25:45 +02:00
parent c626127e43
commit d43c478f40
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"