From 3252d458896f7d16897df1408604d01d4b0d835d Mon Sep 17 00:00:00 2001 From: Ana Krivokapic Date: Wed, 26 Aug 2015 19:24:15 +0200 Subject: 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 --- tuskar_ui/infrastructure/parameters/forms.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tuskar_ui/infrastructure/parameters/forms.py b/tuskar_ui/infrastructure/parameters/forms.py index e0c0609d..a0e91e63 100644 --- a/tuskar_ui/infrastructure/parameters/forms.py +++ b/tuskar_ui/infrastructure/parameters/forms.py @@ -31,13 +31,8 @@ LOG = logging.getLogger(__name__) VIRT_TYPE_CHOICES = [ - ('kvm', _("Baremetal (kvm)")), ('qemu', _("Virtualized (qemu)")), -] - -NEUTRON_PUBLIC_INTERFACE_CHOICES = [ - ('em2', _("Baremetal (em2)")), - ('eth0', _("Virtualized (eth0)")), + ('kvm', _("Baremetal (kvm)")), ] CINDER_ISCSI_HELPER_CHOICES = [ @@ -175,10 +170,10 @@ class SimpleEditServiceConfig(horizon.forms.SelfHandlingForm): help_text=_('If you are testing OpenStack in a virtual machine, ' 'you must configure Compute to use qemu without KVM ' 'and hardware virtualization.')) - neutron_public_interface = django.forms.ChoiceField( + neutron_public_interface = django.forms.CharField( label=_("Public Interface"), - choices=NEUTRON_PUBLIC_INTERFACE_CHOICES, required=True, + initial='eth0', help_text=_('What interface to bridge onto br-ex for network nodes. ' 'If you are testing OpenStack in a virtual machine' 'you must configure interface to eth0.')) -- cgit v1.2.1