Merge "Neutron-Ironic integration patch"

This commit is contained in:
Jenkins 2015-08-10 21:14:18 +00:00 committed by Gerrit Code Review
commit fd2f9fe5b4
1 changed files with 2 additions and 1 deletions

View File

@ -91,7 +91,8 @@ VIF_TYPES = [VIF_TYPE_UNBOUND, VIF_TYPE_BINDING_FAILED, VIF_TYPE_OVS,
VNIC_NORMAL = 'normal'
VNIC_DIRECT = 'direct'
VNIC_MACVTAP = 'macvtap'
VNIC_TYPES = [VNIC_NORMAL, VNIC_DIRECT, VNIC_MACVTAP]
VNIC_BAREMETAL = 'baremetal'
VNIC_TYPES = [VNIC_NORMAL, VNIC_DIRECT, VNIC_MACVTAP, VNIC_BAREMETAL]
EXTENDED_ATTRIBUTES_2_0 = {
'ports': {