summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-04-13 19:24:16 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-04-17 10:42:39 (GMT)
commit87dfef316f63446cc1ebe91a1402eaa00eb33ead (patch)
tree9916e66e81d0a9aa920a16841df4c8737bc9dbe4
parent7a305c418ca7766eb872d18f186eb1f0ba0c86bf (diff)
downloaddefinitions-87dfef316f63446cc1ebe91a1402eaa00eb33ead.tar.gz
Add ntpd server settings to swift ntp conf
This configures ntpd to run as a server if the SWIFT_CONTROLLER variable is not set to False and is not unset. Change-Id: I191acb895418b970aee3bcd371fadc2da5c503a9
-rw-r--r--swift/etc/ntp.conf20
1 files changed, 20 insertions, 0 deletions
diff --git a/swift/etc/ntp.conf b/swift/etc/ntp.conf
index 617a41c..b50886a 100644
--- a/swift/etc/ntp.conf
+++ b/swift/etc/ntp.conf
@@ -1 +1,21 @@
+{% if SWIFT_CONTROLLER is undefined or SWIFT_CONTROLLER == "False" %}
server {{ CONTROLLER_HOST_ADDRESS }} iburst
+{% else %}
+# We use iburst here to reduce the potential initial delay to set the clock
+server 0.pool.ntp.org iburst
+server 1.pool.ntp.org iburst
+server 2.pool.ntp.org iburst
+server 3.pool.ntp.org iburst
+
+# kod - notify client when packets are denied service,
+# rather than just dropping the packets
+#
+# nomodify - deny queries which attempt to modify the state of the server
+#
+# notrap - decline to provide mode 6 control message trap service to
+# matching hosts
+#
+# see ntp.conf(5) for more details
+restrict -4 default kod notrap nomodify
+restrict -6 default kod notrap nomodify
+{% endif %}