MAAS

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

  1. packaging_updateS_bzr1134
  2. Merge into packaging
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 113
Proposed branch: lp:~andreserl/maas/packaging_updateS_bzr1134
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 181 lines (+38/-33)
6 files modified
debian/changelog (+11/-3)
debian/control (+12/-11)
debian/maas-cluster-controller.maas-cluster-celery.upstart (+0/-2)
debian/maas-dhcp.postinst (+1/-1)
debian/maas-region-controller.install (+3/-1)
debian/maas-region-controller.postinst (+11/-15)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_updateS_bzr1134
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Launchpad code reviewers Pending
Review via email: mp+127570@code.launchpad.net

Commit message

* debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server.
* debian/maas-region-controller.postinst: Always update passwords
   on upgrade. No longer check versioning. (LP: #1060094).
* debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}.
* debian/control: Depends on python-netifaces.
* debian/maas-region-controller: Install maas-import-squashfs

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

probably should wrap-and-sort (at least your additional dependency should be added in such that way).
I'd just remove the code you commented out in postinst.

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
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-10-02 05:39:21 +0000
3+++ debian/changelog 2012-10-02 19:42:36 +0000
4@@ -1,10 +1,10 @@
5-maas (0.1+bzr1122+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+maas (0.1+bzr1134+dfsg-0ubuntu2) UNRELEASED; urgency=low
7
8 * New upstream release.
9
10 [ Julian Edwards ]
11 * Ensure isc-dhcp-server is disabled when installing maas-dhcp.
12-
13+
14 [ Raphaël Badin ]
15 * Split celery config into cluster and region configs.
16 * Add region celeryd upstart config.
17@@ -17,7 +17,15 @@
18 * Set root:maas ownership of local cluster config only *after*
19 the maas user/group have been created
20
21- -- Julian Edwards <julian.edwards@canonical.com> Mon, 01 Oct 2012 17:13:57 +1000
22+ [ Andres Rodriguez ]
23+ * debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server.
24+ * debian/maas-region-controller.postinst: Always update passwords
25+ on upgrade. No longer check versioning. (LP: #1060094).
26+ * debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}.
27+ * debian/control: Depends on python-netifaces.
28+ * debian/maas-region-controller: Install maas-import-squashfs
29+
30+ -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 02 Oct 2012 13:39:47 -0400
31
32 maas (0.1+bzr1110+dfsg-0ubuntu1) quantal; urgency=low
33
34
35=== modified file 'debian/control'
36--- debian/control 2012-09-27 04:56:21 +0000
37+++ debian/control 2012-10-02 19:42:36 +0000
38@@ -2,8 +2,12 @@
39 Section: net
40 Priority: optional
41 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
42-Build-Depends: debhelper (>= 8), python (>= 2.7), python-distribute, dh-apport, po-debconf,
43- python-django
44+Build-Depends: debhelper (>= 8),
45+ dh-apport,
46+ po-debconf,
47+ python (>= 2.7),
48+ python-distribute,
49+ python-django
50 Standards-Version: 3.9.3
51 X-Python-Version: >= 2.7
52 XS-Testsuite: autopkgtest
53@@ -11,8 +15,8 @@
54
55 Package: maas
56 Architecture: all
57-Depends: python-django-maas, maas-region-controller, maas-cluster-controller
58-Conflicts: maas-provision, tftpd-hpa, dnsmasq
59+Depends: maas-cluster-controller, maas-region-controller, python-django-maas
60+Conflicts: dnsmasq, maas-provision, tftpd-hpa
61 Replaces: maas-provision
62 Description: Ubuntu MAAS Server
63 Ubuntu MAAS Server is the successor to Orchestra. It offers a
64@@ -84,8 +88,7 @@
65
66 Package: python-maas-provisioningserver
67 Architecture: all
68-Depends: ${misc:Depends},
69- ${python:Depends}
70+Depends: python-netifaces, ${misc:Depends}, ${python:Depends}
71 Conflicts: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
72 Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
73 Description: Ubuntu MAAS Server
74@@ -122,9 +125,7 @@
75
76 Package: python-maas-client
77 Architecture: all
78-Depends: python-oauth,
79- ${misc:Depends},
80- ${python:Depends}
81+Depends: python-oauth, ${misc:Depends}, ${python:Depends}
82 Conflicts: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
83 Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
84 Description: Ubuntu MAAS API Client - (python files)
85@@ -218,7 +219,7 @@
86
87 Package: maas-dhcp
88 Architecture: all
89-Depends: ${misc:Depends}, isc-dhcp-server
90+Depends: isc-dhcp-server, ${misc:Depends}
91 Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
92 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
93 Description: Ubuntu MAAS Server - DHCP Configuration (meta-package)
94@@ -235,7 +236,7 @@
95
96 Package: maas-dns
97 Architecture: all
98-Depends: ${misc:Depends}, maas-dhcp (= ${binary:Version}), bind9
99+Depends: bind9, maas-dhcp (= ${binary:Version}), ${misc:Depends}
100 Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
101 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
102 Description: Ubuntu MAAS Server - DNS configuration (metapackage)
103
104=== modified file 'debian/maas-cluster-controller.maas-cluster-celery.upstart'
105--- debian/maas-cluster-controller.maas-cluster-celery.upstart 2012-10-01 14:01:07 +0000
106+++ debian/maas-cluster-controller.maas-cluster-celery.upstart 2012-10-02 19:42:36 +0000
107@@ -7,8 +7,6 @@
108
109 start on filesystem and net-device-up
110 stop on runlevel [016]
111-setuid maas
112-setgid maas
113
114 env CONFIG_FILE=/etc/maas/maas_cluster.conf
115 # Use cluster config.
116
117=== modified file 'debian/maas-dhcp.postinst'
118--- debian/maas-dhcp.postinst 2012-10-02 04:58:38 +0000
119+++ debian/maas-dhcp.postinst 2012-10-02 19:42:36 +0000
120@@ -4,7 +4,7 @@
121 db_version 2.0
122
123 stop_isc_dhcp_server(){
124- service isc_dhcp_server stop
125+ invoke-rc.d isc-dhcp-server stop
126 }
127
128
129
130=== modified file 'debian/maas-region-controller.install'
131--- debian/maas-region-controller.install 2012-09-29 17:21:10 +0000
132+++ debian/maas-region-controller.install 2012-10-02 19:42:36 +0000
133@@ -27,8 +27,10 @@
134
135 # Install maas-import-pxe-files and related files
136 etc/cron.d/maas-import-pxe-files
137-etc/maas/import_pxe_files
138 man/maas-import-pxe-files.8 usr/share/man/man8
139+debian/tmp/etc/maas/import_pxe_files
140+debian/tmp/usr/sbin/maas-import-squashfs
141+debian/tmp/etc/maas/import_squashfs
142 debian/tmp/usr/sbin/maas-import-ephemerals
143 debian/tmp/etc/maas/import_ephemerals
144 debian/tmp/etc/maas/commissioning-user-data
145
146=== modified file 'debian/maas-region-controller.postinst'
147--- debian/maas-region-controller.postinst 2012-10-02 11:00:41 +0000
148+++ debian/maas-region-controller.postinst 2012-10-02 19:42:36 +0000
149@@ -264,22 +264,18 @@
150 # make sure postgresql is running
151 restart_postgresql
152
153- # If upgrading from any version lower than 0.1+bzr1063+dfsg-0ubuntu1
154 # we need to regenerate the passwords and update configs.
155- if dpkg --compare-versions "$2" lt 0.1+bzr1063+dfsg-0ubuntu1; then
156- # configure maas default url
157- db_get maas/default-maas-url
158- ipaddr="$RET"
159- configure_maas_default_url "$ipaddr"
160- # make sure rabbitmq is running
161- restart_rabbitmq
162- configure_maas_txlongpoll_rabbitmq_user
163- # Handle celery/rabbitmq publishing
164- configure_maas_workers_rabbitmq_user
165- # handle database upgrade
166- dbc_go maas-region-controller $@
167- configure_maas_database "$dbc_dbpass"
168- fi
169+ db_get maas/default-maas-url
170+ ipaddr="$RET"
171+ configure_maas_default_url "$ipaddr"
172+ # make sure rabbitmq is running
173+ restart_rabbitmq
174+ configure_maas_txlongpoll_rabbitmq_user
175+ # Handle celery/rabbitmq publishing
176+ configure_maas_workers_rabbitmq_user
177+ # handle database upgrade
178+ dbc_go maas-region-controller $@
179+ configure_maas_database "$dbc_dbpass"
180
181 maas_sync_migrate_db
182

Subscribers

People subscribed via source and target branches

to all changes: