MAAS

Merge lp:~allenap/maas/packaging.move-maas-delete-and-write-file-to-common into lp:~maas-maintainers/maas/packaging

  1. packaging.move-maas-delete-and-write-file-to-common
  2. Merge into packaging
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: 549
Merged at revision: 548
Proposed branch: lp:~allenap/maas/packaging.move-maas-delete-and-write-file-to-common
Merge into: lp:~maas-maintainers/maas/packaging
Prerequisite: lp:~allenap/maas/packaging.restrict-maas-rack-sudo-rule
Diff against target: 57 lines (+8/-5)
6 files modified
debian/extras/99-maas-common-sudoers (+4/-0)
debian/extras/99-maas-sudoers (+0/-2)
debian/maas-common.install (+2/-0)
debian/maas-common.lintian-overrides (+1/-0)
debian/maas-rack-controller.install (+0/-2)
debian/maas-rack-controller.lintian-overrides (+1/-1)
To merge this branch: bzr merge lp:~allenap/maas/packaging.move-maas-delete-and-write-file-to-common
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+320958@code.launchpad.net

Commit message

Move maas-delete-file and maas-write-file to maas-common.

Description of the change

This has been tested in Jenkins and comes up green: http://162.213.35.104:8080/job/maas-xenial-trunk-manual/350/

[Resubmitted because target branch was wrong.]

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/extras/99-maas-common-sudoers'
--- debian/extras/99-maas-common-sudoers 2016-08-03 10:47:22 +0000
+++ debian/extras/99-maas-common-sudoers 2017-03-24 16:33:37 +0000
@@ -6,3 +6,7 @@
6maas ALL= NOPASSWD: /bin/systemctl restart ntp6maas ALL= NOPASSWD: /bin/systemctl restart ntp
7maas ALL= NOPASSWD: /bin/systemctl start ntp7maas ALL= NOPASSWD: /bin/systemctl start ntp
8maas ALL= NOPASSWD: /bin/systemctl status ntp8maas ALL= NOPASSWD: /bin/systemctl status ntp
9
10# Writing and deleting files as root.
11maas ALL= NOPASSWD: /usr/lib/maas/maas-delete-file
12maas ALL= NOPASSWD: /usr/lib/maas/maas-write-file
913
=== modified file 'debian/extras/99-maas-sudoers'
--- debian/extras/99-maas-sudoers 2017-03-23 09:01:58 +0000
+++ debian/extras/99-maas-sudoers 2017-03-24 16:33:37 +0000
@@ -12,6 +12,4 @@
12maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd12maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
13maas ALL= NOPASSWD: /usr/sbin/maas-rack scan-network *13maas ALL= NOPASSWD: /usr/sbin/maas-rack scan-network *
14maas ALL= NOPASSWD: /usr/lib/maas/maas-network-monitor14maas ALL= NOPASSWD: /usr/lib/maas/maas-network-monitor
15maas ALL= NOPASSWD: /usr/lib/maas/maas-delete-file
16maas ALL= NOPASSWD: /usr/lib/maas/maas-write-file
17maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar15maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar
1816
=== modified file 'debian/maas-common.install'
--- debian/maas-common.install 2016-06-10 18:57:41 +0000
+++ debian/maas-common.install 2017-03-24 16:33:37 +0000
@@ -1,2 +1,4 @@
1debian/tmp/usr/share/maas/maas-rsyslog.conf1debian/tmp/usr/share/maas/maas-rsyslog.conf
2debian/extras/99-maas-common-sudoers etc/sudoers.d2debian/extras/99-maas-common-sudoers etc/sudoers.d
3debian/tmp/usr/lib/maas/maas-delete-file
4debian/tmp/usr/lib/maas/maas-write-file
35
=== added file 'debian/maas-common.lintian-overrides'
--- debian/maas-common.lintian-overrides 1970-01-01 00:00:00 +0000
+++ debian/maas-common.lintian-overrides 2017-03-24 16:33:37 +0000
@@ -0,0 +1,1 @@
1maas-common: binary-without-manpage usr/lib/maas/maas-delete-file usr/lib/maas/maas-write-file
02
=== modified file 'debian/maas-rack-controller.install'
--- debian/maas-rack-controller.install 2017-03-22 15:21:53 +0000
+++ debian/maas-rack-controller.install 2017-03-24 16:33:37 +0000
@@ -7,8 +7,6 @@
7# Install network monitoring scripts7# Install network monitoring scripts
8debian/tmp/usr/lib/maas/maas-network-monitor8debian/tmp/usr/lib/maas/maas-network-monitor
9debian/tmp/usr/lib/maas/maas-dhcp-monitor9debian/tmp/usr/lib/maas/maas-dhcp-monitor
10debian/tmp/usr/lib/maas/maas-delete-file
11debian/tmp/usr/lib/maas/maas-write-file
1210
13# Install all other stuff11# Install all other stuff
14debian/extras/99-maas-sudoers etc/sudoers.d12debian/extras/99-maas-sudoers etc/sudoers.d
1513
=== modified file 'debian/maas-rack-controller.lintian-overrides'
--- debian/maas-rack-controller.lintian-overrides 2017-03-22 15:21:53 +0000
+++ debian/maas-rack-controller.lintian-overrides 2017-03-24 16:33:37 +0000
@@ -1,1 +1,1 @@
1maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-network-monitor usr/lib/maas/maas-dhcp-monitor usr/lib/maas/maas-delete-file usr/lib/maas/maas-write-file1maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-network-monitor usr/lib/maas/maas-dhcp-monitor

Subscribers

People subscribed via source and target branches