diff --git a/.zuul.d/sdn.yaml b/.zuul.d/sdn.yaml index 14fb7bcd7..d232a915b 100644 --- a/.zuul.d/sdn.yaml +++ b/.zuul.d/sdn.yaml @@ -102,7 +102,6 @@ ENABLE_CHASSIS_AS_GW: true KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn KURYR_K8S_OCTAVIA_MEMBER_MODE: L2 - KURYR_K8S_OCTAVIA_SG_MODE: create KURYR_ENFORCE_SG_RULES: false KURYR_LB_ALGORITHM: SOURCE_IP_PORT KURYR_SUBNET_DRIVER: namespace diff --git a/devstack/local.conf.ovn.sample b/devstack/local.conf.ovn.sample index c1b7e5afe..17f95e876 100644 --- a/devstack/local.conf.ovn.sample +++ b/devstack/local.conf.ovn.sample @@ -62,7 +62,6 @@ VAR_RUN_PATH=/usr/local/var/run # members, it must be set to L2 mode # KURYR_EP_DRIVER_OCTAVIA_PROVIDER=ovn # KURYR_K8S_OCTAVIA_MEMBER_MODE=L2 -# KURYR_K8S_OCTAVIA_SG_MODE=create # KURYR_ENFORCE_SG_RULES=False # KURYR_LB_ALGORITHM=SOURCE_IP_PORT diff --git a/devstack/plugin.sh b/devstack/plugin.sh index b24c611d5..8099efce8 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -471,7 +471,6 @@ function configure_neutron_defaults { fi 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 sg_mode "$KURYR_K8S_OCTAVIA_SG_MODE" iniset "$KURYR_CONFIG" octavia_defaults enforce_sg_rules "$KURYR_ENFORCE_SG_RULES" 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 diff --git a/devstack/settings b/devstack/settings index 0e1c755cf..da64f7681 100644 --- a/devstack/settings +++ b/devstack/settings @@ -58,7 +58,6 @@ OPENSHIFT_CNI_BINARY_URL=${OPENSHIFT_CNI_BINARY_URL:-https://github.com/containe # Octavia 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_LB_ALGORITHM=${KURYR_LB_ALGORITHM:-ROUND_ROBIN} diff --git a/kuryr_kubernetes/config.py b/kuryr_kubernetes/config.py index 5aedb3d2a..d1f3b0403 100644 --- a/kuryr_kubernetes/config.py +++ b/kuryr_kubernetes/config.py @@ -246,14 +246,6 @@ octavia_defaults = [ help=_("Define the communication mode between load balanacer " "and its members"), 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', help=_("Enable the enforcement of SG rules at the LB SG " "in case the LB does not maintain the source IP "