Merge lp:~allenap/maas/packaging.ntp-service into lp:~maas-maintainers/maas/packaging

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: 511
Merged at revision: 512
Proposed branch: lp:~allenap/maas/packaging.ntp-service
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 25 lines (+8/-1)
2 files modified
debian/changelog (+2/-1)
debian/extras/99-maas-common-sudoers (+6/-0)
To merge this branch: bzr merge lp:~allenap/maas/packaging.ntp-service
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+301896@code.launchpad.net

Commit message

Give MAAS on both region and rack the ability to start, restart, and get the status of the local NTP service.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm! Please update the changelog as I believe it has now changed.

review: Approve
511. By Gavin Panella

Merge trunk, fix conflict in changelog.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-08-03 14:54:09 +0000
3+++ debian/changelog 2016-08-08 11:04:07 +0000
4@@ -1,6 +1,7 @@
5 maas (2.1.0~alpha1+bzr5222-0ubuntu1) UNRELEASED; urgency=medium
6
7- * UNRELEASED
8+ * Give MAAS on both region and rack the ability to start, restart, and
9+ get the status of the local NTP service.
10
11 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 03 Aug 2016 10:51:50 -0400
12
13
14=== modified file 'debian/extras/99-maas-common-sudoers'
15--- debian/extras/99-maas-common-sudoers 2016-06-10 18:57:41 +0000
16+++ debian/extras/99-maas-common-sudoers 2016-08-08 11:04:07 +0000
17@@ -1,2 +1,8 @@
18 maas ALL= NOPASSWD: /usr/bin/lshw
19 maas ALL= NOPASSWD: /sbin/blockdev
20+
21+# Control of the NTP server: MAAS needs to reconfigure it after editing
22+# its configuration file, and start it again if stopped manually.
23+maas ALL= NOPASSWD: /bin/systemctl restart ntp
24+maas ALL= NOPASSWD: /bin/systemctl start ntp
25+maas ALL= NOPASSWD: /bin/systemctl status ntp

Subscribers

People subscribed via source and target branches