MAAS

Merge lp:~andreserl/maas/packaging_update into lp:~maas-maintainers/maas/packaging

  1. packaging_update
  2. Merge into packaging
Proposed by Andres Rodriguez on 2012-09-25
Status: Merged
Approved by: Julian Edwards on 2012-09-25
Approved revision: no longer in the source branch.
Merged at revision: 95
Proposed branch: lp:~andreserl/maas/packaging_update
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 42 lines (+6/-4)
3 files modified
debian/changelog (+3/-1)
debian/extras/99-maas-sudoers (+1/-1)
debian/maas.postinst (+2/-2)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_update
Reviewer Review Type Date Requested Status
Julian Edwards (community) 2012-09-25 Approve on 2012-09-25
Review via email: mp+126350@code.launchpad.net

Commit Message

debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job
instead of isc-dhcp-server (LP: #1055951)

To post a comment you must log in.
Julian Edwards (julian-edwards) :
review: Approve
lp:~andreserl/maas/packaging_update updated on 2012-09-25
95. By Andres Rodriguez on 2012-09-25

[r=julian-edwards][bug=1055951][author=andreserl] debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job
instead of isc-dhcp-server (LP: #1055951)

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 2012-09-21 16:54:02 +0000
3+++ debian/changelog 2012-09-25 23:21:23 +0000
4@@ -1,4 +1,4 @@
5-maas (0.1+bzr1049+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+maas (0.1+bzr1063+dfsg-0ubuntu1) UNRELEASED; urgency=low
7
8 * New upstream release
9
10@@ -33,6 +33,8 @@
11 Depend on it.
12 * debian/rules: Install maas-dhcp-server upstart job.
13 * debian/maas.postrm: Remove celery worker rabbitmq user and host.
14+ * debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job
15+ instead of isc-dhcp-server (LP: #1055951)
16
17 [ Raphael Badin ]
18 * Install maas_local_celeryconfig.py in /etc/maas and symlink to
19
20=== modified file 'debian/extras/99-maas-sudoers'
21--- debian/extras/99-maas-sudoers 2012-09-05 16:40:12 +0000
22+++ debian/extras/99-maas-sudoers 2012-09-25 23:21:23 +0000
23@@ -1,2 +1,2 @@
24-maas ALL= NOPASSWD: /usr/sbin/service isc-dhcp-server restart
25+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server restart
26 maas ALL= NOPASSWD: /usr/sbin/maas-provision
27
28=== modified file 'debian/maas.postinst'
29--- debian/maas.postinst 2012-09-21 16:54:02 +0000
30+++ debian/maas.postinst 2012-09-25 23:21:23 +0000
31@@ -268,9 +268,9 @@
32 if dpkg --compare-versions "$2" lt 0.1+bzr459+dfsg-0ubuntu1; then
33 configure_maas_tgt
34 fi
35- # If upgrading from any version lower than 0.1+bzr1049+dfsg-0ubuntu1
36+ # If upgrading from any version lower than 0.1+bzr1063+dfsg-0ubuntu1
37 # we need to regenerate the passwords and update configs.
38- if dpkg --compare-versions "$2" lt 0.1+bzr1049+dfsg-0ubuntu1; then
39+ if dpkg --compare-versions "$2" lt 0.1+bzr1063+dfsg-0ubuntu1; then
40 # configure maas default url
41 db_get maas/default-maas-url
42 ipaddr="$RET"

Subscribers

People subscribed via source and target branches

to all changes: