Browse Source

Merge "Update Network Port VNIC Types"

Jenkins 2 years ago
parent
commit
5d5dcf3e9e

+ 2
- 2
doc/source/topics/settings.rst View File

@@ -1365,8 +1365,8 @@ Default ``['*']``
1365 1365
 
1366 1366
 For use with the port binding extension. Use this to explicitly set which VNIC
1367 1367
 types are supported; only those listed will be shown when creating or editing
1368
-a port. VNIC types include normal, direct and macvtap. By default all VNIC
1369
-types will be available to choose from.
1368
+a port. VNIC types include normal, direct, direct-physical, macvtap and
1369
+baremetal. By default all VNIC types will be available to choose from.
1370 1370
 
1371 1371
 Example ``['normal', 'direct']``
1372 1372
 

+ 5
- 2
openstack_dashboard/dashboards/admin/networks/ports/forms.py View File

@@ -28,8 +28,11 @@ from openstack_dashboard.dashboards.project.networks.ports \
28 28
 
29 29
 
30 30
 LOG = logging.getLogger(__name__)
31
-VNIC_TYPES = [('normal', _('Normal')), ('direct', _('Direct')),
32
-              ('macvtap', _('MacVTap'))]
31
+VNIC_TYPES = [('normal', _('Normal')),
32
+              ('direct', _('Direct')),
33
+              ('direct-physical', _('Direct Physical')),
34
+              ('macvtap', _('MacVTap')),
35
+              ('baremetal', _('Bare Metal'))]
33 36
 
34 37
 
35 38
 class CreatePort(project_forms.CreatePort):

+ 5
- 2
openstack_dashboard/dashboards/project/networks/ports/forms.py View File

@@ -26,8 +26,11 @@ from openstack_dashboard import api
26 26
 
27 27
 
28 28
 LOG = logging.getLogger(__name__)
29
-VNIC_TYPES = [('normal', _('Normal')), ('direct', _('Direct')),
30
-              ('macvtap', _('MacVTap'))]
29
+VNIC_TYPES = [('normal', _('Normal')),
30
+              ('direct', _('Direct')),
31
+              ('direct-physical', _('Direct Physical')),
32
+              ('macvtap', _('MacVTap')),
33
+              ('baremetal', _('Bare Metal'))]
31 34
 
32 35
 
33 36
 class CreatePort(forms.SelfHandlingForm):

+ 3
- 1
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/networkports/ports.controller.js View File

@@ -47,7 +47,9 @@
47 47
     ctrl.vnicTypes = {
48 48
       'normal': gettext('Normal'),
49 49
       'direct': gettext('Direct'),
50
-      'macvtap': gettext('MacVTap')
50
+      'direct-physical': gettext('Direct Physical'),
51
+      'macvtap': gettext('MacVTap'),
52
+      'baremetal': gettext('Bare Metal')
51 53
     };
52 54
 
53 55
     ctrl.tableDataMulti = {

+ 2
- 1
openstack_dashboard/local/local_settings.py.example View File

@@ -321,7 +321,8 @@ OPENSTACK_NEUTRON_NETWORK = {
321 321
     # Set which VNIC types are supported for port binding. Only the VNIC
322 322
     # types in this list will be available to choose from when creating a
323 323
     # port.
324
-    # VNIC types include 'normal', 'macvtap' and 'direct'.
324
+    # VNIC types include 'normal', 'direct', 'direct-physical', 'macvtap' and
325
+    # 'baremetal'
325 326
     # Set to empty list or None to disable VNIC type selection.
326 327
     'supported_vnic_types': ['*'],
327 328
 

Loading…
Cancel
Save