summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLadislav Smola <lsmola@redhat.com>2014-10-15 10:21:23 +0200
committerLadislav Smola <lsmola@redhat.com>2014-10-15 10:21:23 +0200
commit848478fd3a6578ed9d5e06664a8d3cd9345944db (patch)
tree759b16501c7533193149b741f4a16f49c2440990
parentc7544532c6049c932cb18f59f66b2cff44749e2f (diff)
downloadtuskar-ui-848478fd3a6578ed9d5e06664a8d3cd9345944db.tar.gz
Adding NTP server parameter
In production, public NTP servers should not be used, we need parameter to define the right one. Change-Id: Ic76c9a075a154279e15c663ddbdf843333514919
-rw-r--r--tuskar_ui/infrastructure/parameters/forms.py11
-rw-r--r--tuskar_ui/infrastructure/parameters/tests.py3
-rw-r--r--tuskar_ui/infrastructure/parameters/views.py5
3 files changed, 17 insertions, 2 deletions
diff --git a/tuskar_ui/infrastructure/parameters/forms.py b/tuskar_ui/infrastructure/parameters/forms.py
index e557874f..85812fe5 100644
--- a/tuskar_ui/infrastructure/parameters/forms.py
+++ b/tuskar_ui/infrastructure/parameters/forms.py
@@ -74,6 +74,12 @@ class EditServiceConfig(horizon.forms.SelfHandlingForm):
choices=CINDER_ISCSI_HELPER_CHOICES,
required=True,
help_text=_('The iSCSI helper to use with cinder.'))
+ ntp_server = django.forms.CharField(
+ label=_("NTP server"),
+ required=False,
+ initial="",
+ help_text=_('Address of the NTP server. If blank, public NTP servers '
+ 'will be used.'))
@staticmethod
def _load_snmp_parameters(plan, data):
@@ -98,6 +104,7 @@ class EditServiceConfig(horizon.forms.SelfHandlingForm):
neutron_public_interface = data.get('neutron_public_interface')
cloud_name = data.get('cloud_name')
cinder_iscsi_helper = data.get('cinder_iscsi_helper')
+ ntp_server = data.get('ntp_server')
parameters = {
compute_prefix + 'NovaComputeLibvirtType': virt_type,
@@ -110,6 +117,10 @@ class EditServiceConfig(horizon.forms.SelfHandlingForm):
neutron_public_interface,
cinder_prefix + 'NeutronPublicInterface':
neutron_public_interface,
+ controller_prefix + 'NtpServer':
+ ntp_server,
+ compute_prefix + 'NtpServer':
+ ntp_server,
}
parameters.update(self._load_snmp_parameters(plan, data))
diff --git a/tuskar_ui/infrastructure/parameters/tests.py b/tuskar_ui/infrastructure/parameters/tests.py
index b1d14456..18d7c37d 100644
--- a/tuskar_ui/infrastructure/parameters/tests.py
+++ b/tuskar_ui/infrastructure/parameters/tests.py
@@ -96,4 +96,5 @@ class ParametersTest(test.BaseAdminViewTests):
'Controller-1::NovaComputeLibvirtType': u'qemu',
'Compute-1::SnmpdReadonlyUserPassword': u'password',
'Block Storage-1::SnmpdReadonlyUserPassword': u'password',
- 'Object Storage-1::SnmpdReadonlyUserPassword': u'password'})
+ 'Object Storage-1::SnmpdReadonlyUserPassword': u'password',
+ 'Controller-1::NtpServer': u''})
diff --git a/tuskar_ui/infrastructure/parameters/views.py b/tuskar_ui/infrastructure/parameters/views.py
index 8e23eafb..9f5e47ee 100644
--- a/tuskar_ui/infrastructure/parameters/views.py
+++ b/tuskar_ui/infrastructure/parameters/views.py
@@ -44,13 +44,16 @@ class ServiceConfigView(horizon.forms.ModalFormView):
controller_prefix + 'CloudName')
neutron_public_interface = plan.parameter_value(
controller_prefix + 'NeutronPublicInterface')
+ ntp_server = plan.parameter_value(
+ controller_prefix + 'NtpServer')
return {
'virt_type': virt_type,
'snmp_password': snmp_password,
'cinder_iscsi_helper': cinder_iscsi_helper,
'cloud_name': cloud_name,
- 'neutron_public_interface': neutron_public_interface}
+ 'neutron_public_interface': neutron_public_interface,
+ 'ntp_server': ntp_server}
class IndexView(horizon_tabs.TabbedTableView):