openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Clean up references to the sg config option"

This commit is contained in:
Zuul 2020-11-02 18:53:47 +00:00 committed by Gerrit Code Review
parent 68088640fd 9fb0c607a1
commit 1a3ffb6d9d
5 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.d/sdn.yaml
View File

@ -102,7 +102,6 @@
ENABLE_CHASSIS_AS_GW: true ENABLE_CHASSIS_AS_GW: true
KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2 KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
KURYR_K8S_OCTAVIA_SG_MODE: create
KURYR_ENFORCE_SG_RULES: false KURYR_ENFORCE_SG_RULES: false
KURYR_LB_ALGORITHM: SOURCE_IP_PORT KURYR_LB_ALGORITHM: SOURCE_IP_PORT
KURYR_SUBNET_DRIVER: namespace KURYR_SUBNET_DRIVER: namespace

1
devstack/local.conf.ovn.sample
View File

@ -62,7 +62,6 @@ VAR_RUN_PATH=/usr/local/var/run
# members, it must be set to L2 mode # members, it must be set to L2 mode
# KURYR_EP_DRIVER_OCTAVIA_PROVIDER=ovn # KURYR_EP_DRIVER_OCTAVIA_PROVIDER=ovn
# KURYR_K8S_OCTAVIA_MEMBER_MODE=L2 # KURYR_K8S_OCTAVIA_MEMBER_MODE=L2
# KURYR_K8S_OCTAVIA_SG_MODE=create
# KURYR_ENFORCE_SG_RULES=False # KURYR_ENFORCE_SG_RULES=False
# KURYR_LB_ALGORITHM=SOURCE_IP_PORT # KURYR_LB_ALGORITHM=SOURCE_IP_PORT

1
devstack/plugin.sh
View File

@ -471,7 +471,6 @@ function configure_neutron_defaults {
fi fi
iniset "$KURYR_CONFIG" neutron_defaults external_svc_net "$ext_svc_net_id" iniset "$KURYR_CONFIG" neutron_defaults external_svc_net "$ext_svc_net_id"
iniset "$KURYR_CONFIG" octavia_defaults member_mode "$KURYR_K8S_OCTAVIA_MEMBER_MODE" iniset "$KURYR_CONFIG" octavia_defaults member_mode "$KURYR_K8S_OCTAVIA_MEMBER_MODE"
iniset "$KURYR_CONFIG" octavia_defaults sg_mode "$KURYR_K8S_OCTAVIA_SG_MODE"
iniset "$KURYR_CONFIG" octavia_defaults enforce_sg_rules "$KURYR_ENFORCE_SG_RULES" iniset "$KURYR_CONFIG" octavia_defaults enforce_sg_rules "$KURYR_ENFORCE_SG_RULES"
iniset "$KURYR_CONFIG" octavia_defaults lb_algorithm "$KURYR_LB_ALGORITHM" iniset "$KURYR_CONFIG" octavia_defaults lb_algorithm "$KURYR_LB_ALGORITHM"
# Octavia takes a very long time to start the LB in the gate. We need # Octavia takes a very long time to start the LB in the gate. We need

1
devstack/settings
View File

@ -58,7 +58,6 @@ OPENSHIFT_CNI_BINARY_URL=${OPENSHIFT_CNI_BINARY_URL:-https://github.com/containe
# Octavia # Octavia
KURYR_K8S_OCTAVIA_MEMBER_MODE=${KURYR_K8S_OCTAVIA_MEMBER_MODE:-L3} KURYR_K8S_OCTAVIA_MEMBER_MODE=${KURYR_K8S_OCTAVIA_MEMBER_MODE:-L3}
KURYR_K8S_OCTAVIA_SG_MODE=${KURYR_K8S_OCTAVIA_SG_MODE:-update}
KURYR_ENFORCE_SG_RULES=${KURYR_ENFORCE_SG_RULES:-True} KURYR_ENFORCE_SG_RULES=${KURYR_ENFORCE_SG_RULES:-True}
KURYR_LB_ALGORITHM=${KURYR_LB_ALGORITHM:-ROUND_ROBIN} KURYR_LB_ALGORITHM=${KURYR_LB_ALGORITHM:-ROUND_ROBIN}

8
kuryr_kubernetes/config.py
View File

@ -246,14 +246,6 @@ octavia_defaults = [
help=_("Define the communication mode between load balanacer " help=_("Define the communication mode between load balanacer "
"and its members"), "and its members"),
default='L3'), default='L3'),
cfg.StrOpt('sg_mode',
help=_("Define the LBaaS SG policy."),
choices=[('create', 'replace the VIP SG with a new one'),
('update', 'add rules to the existing VIP SG')],
default='update',
deprecated_for_removal=True,
deprecated_reason="enforce_sg_rules option can be used"
" instead"),
cfg.BoolOpt('enforce_sg_rules', cfg.BoolOpt('enforce_sg_rules',
help=_("Enable the enforcement of SG rules at the LB SG " help=_("Enable the enforcement of SG rules at the LB SG "
"in case the LB does not maintain the source IP " "in case the LB does not maintain the source IP "