openstack
/
neutron
Code Issues Proposed changes

Merge "Add trunk subports to be one of dvr serviced device owners" into stable/stein

This commit is contained in:
Zuul 2020-04-15 01:37:54 +00:00 committed by Gerrit Code Review
parent 95d62b01e6 08f3633990
commit 48e565b379
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/common/utils.py
View File

@ -36,6 +36,7 @@ from eventlet.green import subprocess
import netaddr
from neutron_lib import constants as n_const
from neutron_lib.db import api as db_api
from neutron_lib.services.trunk import constants as trunk_constants
from neutron_lib.utils import helpers
from oslo_config import cfg
from oslo_db import exception as db_exc
@ -170,7 +171,8 @@ def get_other_dvr_serviced_device_owners(host_dvr_for_dhcp=True):
separately (see is_dvr_serviced() below)
"""
device_owners = [n_const.DEVICE_OWNER_LOADBALANCER,
n_const.DEVICE_OWNER_LOADBALANCERV2]
n_const.DEVICE_OWNER_LOADBALANCERV2,
trunk_constants.TRUNK_SUBPORT_OWNER]
if host_dvr_for_dhcp:
device_owners.append(n_const.DEVICE_OWNER_DHCP)
return device_owners