Merge ~andreserl/maas:chrony_packaging_snap into maas:master

[Andres Rodriguez]

Update packaging and snap changes to support chrony.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b chrony_packaging_snap lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 5d0588852a2a99b8a2e91e7eab10b593e70f2420

review: Approve

[Blake Rouse (blake-rouse)]

Looks good. Just one question, but not going to block you. I assume its not needed.

review: Approve

[Andres Rodriguez (andreserl)]

Chrony transition [1] and this branch have been approved.

I'm re-proposing this PR without a pre-req so both changes land in a single branch and test together in the CI.

[1]: https://code.launchpad.net/~andreserl/maas/+git/maas/+merge/339706

Unmerged commits

5d05888... by Andres Rodriguez on 2018-02-26

Package & snap chrony changes

97c7783... by Andres Rodriguez on 2018-02-26

Core changes for chrony

diff --git a/debian/control b/debian/control
index 1cc60c5..19fe921 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Depends: bind9utils,
          maas-cli (=${binary:Version}),
          maas-common (= ${binary:Version}),
          maas-proxy (= ${binary:Version}),
-         ntp,
+         chrony,
          python3-bson,
          python3-django,
          python3-django-maas (= ${binary:Version}),
@@ -88,7 +88,7 @@ Depends: bind9utils,
          ubuntu-keyring,
          ${misc:Depends},
          ${python3:Depends}
-Conflicts: maas-region-controller-min
+Conflicts: maas-region-controller-min, ntp
 Replaces: maas-region-controller-min
 Provides: maas-region-controller-min
 Description: Region controller API service for MAAS
@@ -204,7 +204,7 @@ Depends: authbind,
          maas-cli (=${binary:Version}),
          maas-common (=${binary:Version}),
          maas-dhcp (=${binary:Version}),
-         ntp,
+         chrony,
          pxelinux | syslinux-common (<< 3:6.00~pre4+dfsg-5),
          python3-httplib2,
          python3-maas-provisioningserver (=${binary:Version}),
@@ -220,7 +220,7 @@ Depends: authbind,
          ${python3:Depends}
 Recommends: libvirt-clients
 Suggests: amtterm, ipmitool, nmap, wsmancli
-Conflicts: tftpd-hpa
+Conflicts: tftpd-hpa, ntp
 Breaks: python-maas-provisioningserver,
         maas-cluster-controller
 Replaces: python-maas-provisioningserver,
diff --git a/debian/extras/99-maas-common-sudoers b/debian/extras/99-maas-common-sudoers
index 8aedc86..5429069 100644
--- a/debian/extras/99-maas-common-sudoers
+++ b/debian/extras/99-maas-common-sudoers
@@ -7,9 +7,9 @@ maas ALL= NOPASSWD: /usr/lib/maas/beacon-monitor
 
 # Control of the NTP server: MAAS needs to reconfigure it after editing
 # its configuration file, and start it again if stopped manually.
-maas ALL= NOPASSWD: /bin/systemctl restart ntp
-maas ALL= NOPASSWD: /bin/systemctl start ntp
-maas ALL= NOPASSWD: /bin/systemctl status ntp
+maas ALL= NOPASSWD: /bin/systemctl restart chrony
+maas ALL= NOPASSWD: /bin/systemctl start chrony
+maas ALL= NOPASSWD: /bin/systemctl status chrony
 
 # Writing and deleting files as root.
 maas ALL= NOPASSWD: /usr/lib/maas/maas-delete-file
diff --git a/debian/maas-common.dirs b/debian/maas-common.dirs
index a780b08..6d72826 100644
--- a/debian/maas-common.dirs
+++ b/debian/maas-common.dirs
@@ -1,3 +1,2 @@
 var/log/maas
 var/lib/maas
-etc/ntp
diff --git a/snap/bin/run-ntpd b/snap/bin/run-chronyd
index 5144073..e91c561 100755
--- a/snap/bin/run-ntpd
+++ b/snap/bin/run-chronyd
@@ -5,13 +5,13 @@
 set -e
 
 # Create the required directories.
-mkdir -p $SNAP_DATA/etc/ntp
+mkdir -p $SNAP_DATA/etc/chrony
 mkdir -p $SNAP_COMMON/log/ntpstats
 
 # Copy the initial ntp.conf if it doesn't exist.
-if [ ! -e "$SNAP_DATA/etc/ntp.conf" ]; then
-    cp "$SNAP/usr/share/maas/ntp.conf" "$SNAP_DATA/etc/ntp.conf"
+if [ ! -e "$SNAP_DATA/etc/chrony/chrony.conf" ]; then
+    cp "$SNAP/usr/share/maas/chrony.conf" "$SNAP_DATA/etc/chrony/chrony.conf"
 fi
 
 # Run ntpd.
-exec $SNAP/usr/sbin/ntpd -n -d -c "$SNAP_DATA/etc/ntp.conf"
+exec $SNAP/usr/sbin/chronyd -d -f "$SNAP_DATA/etc/chrony/chrony.conf"
diff --git a/snap/conf/chrony.conf b/snap/conf/chrony.conf
new file mode 100644
index 0000000..f9b2fa2
--- /dev/null
+++ b/snap/conf/chrony.conf
@@ -0,0 +1,38 @@
+# Welcome to the chrony configuration file. See chrony.conf(5) for more
+# information about usuable directives.
+
+# Use servers from the NTP Pool Project. Approved by Ubuntu Technical Board
+# on 2011-02-08 (LP: #104525). See http://www.pool.ntp.org/join.html for
+# more information.
+pool 0.ubuntu.pool.ntp.org iburst
+pool 1.ubuntu.pool.ntp.org iburst
+pool 2.ubuntu.pool.ntp.org iburst
+pool 3.ubuntu.pool.ntp.org iburst
+
+# Use Ubuntu's ntp server as a fallback.
+pool ntp.ubuntu.com
+
+# This directive specify the location of the file containing ID/key pairs for
+# NTP authentication.
+keyfile /var/snap/maas/current/etc/chrony/chrony.keys
+
+# This directive specify the file into which chronyd will store the rate
+# information.
+driftfile /var/snap/maas/current/var/lib/chrony/chrony.drift
+
+# Uncomment the following line to turn logging on.
+#log tracking measurements statistics
+
+# Log files location.
+logdir /var/snap/maas/current/var/log/chrony
+
+# Stop bad estimates upsetting machine clock.
+maxupdateskew 100.0
+
+# This directive enables kernel synchronisation (every 11 minutes) of the
+# real-time clock. Note that it can’t be used along with the 'rtcfile' directive.
+rtcsync
+
+# Step the system clock instead of slewing it if the adjustment is larger than
+# one second, but only in the first three clock updates.
+makestep 1 3
diff --git a/snap/conf/ntp.conf b/snap/conf/ntp.conf
deleted file mode 100644
index 8a0d50e..0000000
--- a/snap/conf/ntp.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
-
-driftfile /var/snap/maas/current/etc/ntp/ntp.drift
-
-# Enable this if you want statistics to be logged.
-statsdir /var/snap/maas/common/log/ntpstats/
-
-statistics loopstats peerstats clockstats
-filegen loopstats file loopstats type day enable
-filegen peerstats file peerstats type day enable
-filegen clockstats file clockstats type day enable
-
-# Specify one or more NTP servers.
-
-# Use servers from the NTP Pool Project. Approved by Ubuntu Technical Board
-# on 2011-02-08 (LP: #104525). See http://www.pool.ntp.org/join.html for
-# more information.
-pool 0.ubuntu.pool.ntp.org iburst
-pool 1.ubuntu.pool.ntp.org iburst
-pool 2.ubuntu.pool.ntp.org iburst
-pool 3.ubuntu.pool.ntp.org iburst
-
-# Use Ubuntu's ntp server as a fallback.
-pool ntp.ubuntu.com
-
-# Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
-# details.  The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions>
-# might also be helpful.
-#
-# Note that "restrict" applies to both servers and clients, so a configuration
-# that might be intended to block requests from certain clients could also end
-# up blocking replies from your own upstream servers.
-
-# By default, exchange time with everybody, but don't allow configuration.
-restrict -4 default kod notrap nomodify nopeer noquery limited
-restrict -6 default kod notrap nomodify nopeer noquery limited
-
-# Local users may interrogate the ntp server more closely.
-restrict 127.0.0.1
-restrict ::1
-
-# Needed for adding pool entries
-restrict source notrap nomodify noquery
-
-# Clients from this (example!) subnet have unlimited access, but only if
-# cryptographically authenticated.
-#restrict 192.168.123.0 mask 255.255.255.0 notrust
-
-# If you want to provide time to your local subnet, change the next line.
-# (Again, the address is an example only.)
-#broadcast 192.168.123.255
-
-# If you want to listen to time broadcasts on your local subnet, de-comment the
-# next lines.  Please do this only if you trust everybody on the network!
-#disable auth
-#broadcastclient
-
-#Changes recquired to use pps synchonisation as explained in documentation:
-#http://www.ntp.org/ntpfaq/NTP-s-config-adv.htm#AEN3918
-
-#server 127.127.8.1 mode 135 prefer    # Meinberg GPS167 with PPS
-#fudge 127.127.8.1 time1 0.0042        # relative to PPS for my hardware
-
-#server 127.127.22.1                   # ATOM(PPS)
-#fudge 127.127.22.1 flag3 1            # enable PPS API
diff --git a/snap/conf/supervisord.conf.template b/snap/conf/supervisord.conf.template
index f7d1da8..758aff2 100644
--- a/snap/conf/supervisord.conf.template
+++ b/snap/conf/supervisord.conf.template
@@ -92,9 +92,9 @@ stdout_logfile=%(ENV_SNAP_COMMON)s/log/dhcpd6.log
 {{if rackd or regiond}}
 [program:ntp]
 process_name=ntp
-command=%(ENV_SNAP)s/bin/run-ntpd
+command=%(ENV_SNAP)s/bin/run-chronyd
 stopasgroup=true
 killasgroup=true
 redirect_stderr=true
-stdout_logfile=%(ENV_SNAP_COMMON)s/log/ntp.log
+stdout_logfile=%(ENV_SNAP_COMMON)s/log/chrony.log
 {{endif}}
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ffb1c52..07d6283 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -52,7 +52,7 @@ parts:
       - libjs-yui3-full
       - libjs-yui3-min
       - lshw
-      - ntp
+      - chrony
       - openssh-client
       - postgresql
       - python3-bson
@@ -136,7 +136,7 @@ parts:
     source: snap
     organize:
       bind: usr/share/maas/bind
-      conf/ntp.conf: usr/share/maas/ntp.conf
+      conf/chrony.conf: usr/share/maas/chrony.conf
       conf/supervisord.conf.template: usr/share/maas/supervisord.conf.template
     stage:
       - -conf