Use textfield for public interface in simplified config
Previously the dropdown choice selection of possible network interfaces was limiting. We are now using a free text field to remove this limitation. Change-Id: I1eb1e495282e7fa520c8225ba16fa61a32b3d24d Closes-bug: bz/1252553
This commit is contained in:
parent
6d9d5419ea
commit
3252d45889
@ -31,13 +31,8 @@ LOG = logging.getLogger(__name__)
|
|||||||
|
|
||||||
|
|
||||||
VIRT_TYPE_CHOICES = [
|
VIRT_TYPE_CHOICES = [
|
||||||
('kvm', _("Baremetal (kvm)")),
|
|
||||||
('qemu', _("Virtualized (qemu)")),
|
('qemu', _("Virtualized (qemu)")),
|
||||||
]
|
('kvm', _("Baremetal (kvm)")),
|
||||||
|
|
||||||
NEUTRON_PUBLIC_INTERFACE_CHOICES = [
|
|
||||||
('em2', _("Baremetal (em2)")),
|
|
||||||
('eth0', _("Virtualized (eth0)")),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
CINDER_ISCSI_HELPER_CHOICES = [
|
CINDER_ISCSI_HELPER_CHOICES = [
|
||||||
@ -175,10 +170,10 @@ class SimpleEditServiceConfig(horizon.forms.SelfHandlingForm):
|
|||||||
help_text=_('If you are testing OpenStack in a virtual machine, '
|
help_text=_('If you are testing OpenStack in a virtual machine, '
|
||||||
'you must configure Compute to use qemu without KVM '
|
'you must configure Compute to use qemu without KVM '
|
||||||
'and hardware virtualization.'))
|
'and hardware virtualization.'))
|
||||||
neutron_public_interface = django.forms.ChoiceField(
|
neutron_public_interface = django.forms.CharField(
|
||||||
label=_("Public Interface"),
|
label=_("Public Interface"),
|
||||||
choices=NEUTRON_PUBLIC_INTERFACE_CHOICES,
|
|
||||||
required=True,
|
required=True,
|
||||||
|
initial='eth0',
|
||||||
help_text=_('What interface to bridge onto br-ex for network nodes. '
|
help_text=_('What interface to bridge onto br-ex for network nodes. '
|
||||||
'If you are testing OpenStack in a virtual machine'
|
'If you are testing OpenStack in a virtual machine'
|
||||||
'you must configure interface to eth0.'))
|
'you must configure interface to eth0.'))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user