Merge lp:~gandelman-a/nova/lp839796_and_856530 into lp:~ubuntu-server-dev/nova/diablo

Proposed by Adam Gandelman on 2011-09-27
Status: Merged
Merged at revision: 206
Proposed branch: lp:~gandelman-a/nova/lp839796_and_856530
Merge into: lp:~ubuntu-server-dev/nova/diablo
Diff against target: 68 lines (+17/-9)
4 files modified
debian/changelog (+6/-0)
debian/nova-common.postinst (+10/-7)
debian/nova-compute.upstart.in (+1/-1)
debian/nova.conf (+0/-1)
To merge this branch: bzr merge lp:~gandelman-a/nova/lp839796_and_856530
Reviewer Review Type Date Requested Status
Chuck Short 2011-09-27 Approve on 2011-09-27
Review via email: mp+77078@code.launchpad.net

Description of the Change

* debian/nova-common.postinst: Create 'nova' group, add user to it
 (LP: #856530)
* debian/nova.conf, debian/nova-compute.upstart.in: Move reference of
  nova-compute.conf from nova.conf to nova-compute's argv. (LP: #839796)

To post a comment you must log in.
Chuck Short (zulcss) wrote :

lgtm

review: Approve
Scott Moser (smoser) wrote :

did you/could you propose this same merge to lp:~openstack-ubuntu-packagers/nova/ubuntu ?

Adam Gandelman (gandelman-a) wrote :

Scott-- Applied to upstream packaging branch and proposed via lp:~gandelman-a/nova/openstack-ubuntu-packagers

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 2011-09-26 20:08:15 +0000
3+++ debian/changelog 2011-09-27 01:54:17 +0000
4@@ -1,5 +1,11 @@
5 nova (2011.3-0ubuntu3) UNRELEASED; urgency=low
6
7+ [Adam Gandelman]
8+ * debian/nova-common.postinst: Create 'nova' group, add user to it
9+ (LP: #856530)
10+ * debian/nova.conf, debian/nova-compute.upstart.in: Move reference of
11+ nova-compute.conf from nova.conf to nova-compute's argv. (LP: #839796)
12+
13 [Chuck Short]
14 * debian/patches/backport-recreate-gateway-using-dhcp.patch:
15 Makes sure to recreate gateway for moved ip. (LP: #859587)
16
17=== modified file 'debian/nova-common.postinst'
18--- debian/nova-common.postinst 2011-08-11 11:27:36 +0000
19+++ debian/nova-common.postinst 2011-09-27 01:54:17 +0000
20@@ -1,16 +1,19 @@
21 #!/bin/sh -e
22
23 if [ "$1" = "configure" ]; then
24+ if ! getent group nova > /dev/null 2>&1; then
25+ addgroup --system nova >/dev/null
26+ fi
27 if ! getent passwd nova > /dev/null 2>&1; then
28- adduser --system --home /var/lib/nova --no-create-home --shell /bin/bash nova
29+ adduser --system --home /var/lib/nova --ingroup nova --no-create-home --shell /bin/bash nova
30 fi
31- chown -R nova:root /var/lib/nova/ /var/log/nova/ /etc/nova/nova.conf
32+ chown -R nova:nova /var/lib/nova/ /var/log/nova/ /etc/nova/nova.conf
33 chmod 600 /etc/nova/nova.conf
34- chmod 0440 /etc/sudoers.d/nova_sudoers
35- if ! grep -q sql_connection /etc/nova/nova.conf
36- then
37- su -c 'nova-manage db sync' nova
38- fi
39+ chmod 0440 /etc/sudoers.d/nova_sudoers
40+ if ! grep -q sql_connection /etc/nova/nova.conf
41+ then
42+ su -c 'nova-manage db sync' nova
43+ fi
44 fi
45
46 #DEBHELPER#
47
48=== modified file 'debian/nova-compute.upstart.in'
49--- debian/nova-compute.upstart.in 2011-08-11 13:29:06 +0000
50+++ debian/nova-compute.upstart.in 2011-09-27 01:54:17 +0000
51@@ -17,4 +17,4 @@
52 modprobe nbd
53 end script
54
55-exec su -c "nova-compute --flagfile=/etc/nova/nova.conf" nova
56+exec su -c "nova-compute --flagfile=/etc/nova/nova.conf --flagfile=/etc/nova/nova-compute.conf" nova
57
58=== modified file 'debian/nova.conf'
59--- debian/nova.conf 2011-09-23 15:44:49 +0000
60+++ debian/nova.conf 2011-09-27 01:54:17 +0000
61@@ -3,7 +3,6 @@
62 --logdir=/var/log/nova
63 --state_path=/var/lib/nova
64 --lock_path=/var/lock/nova
65---flagfile=/etc/nova/nova-compute.conf
66 --force_dhcp_release=True
67 --use_deprecated_auth
68 --iscsi_helper=tgtadm

Subscribers

People subscribed via source and target branches