OpenStack Object Storage (swift)

Merge lp:~james-page/swift/essex-fixup-upstart into lp:~ubuntu-server-dev/swift/essex

  1. essex-fixup-upstart
  2. Merge into essex
Proposed by James Page on 2012-03-15
Status: Merged
Merged at revision: 88
Proposed branch: lp:~james-page/swift/essex-fixup-upstart
Merge into: lp:~ubuntu-server-dev/swift/essex
Diff against target: 200 lines (+26/-17)
14 files modified
debian/changelog (+9/-0)
debian/rules (+5/-5)
debian/swift-account.swift-account-auditor.upstart.in (+1/-1)
debian/swift-account.swift-account-reaper.upstart.in (+1/-1)
debian/swift-account.swift-account-replicator.upstart.in (+1/-1)
debian/swift-account.upstart.in (+1/-1)
debian/swift-container.swift-container-auditor.upstart.in (+1/-1)
debian/swift-container.swift-container-replicator.upstart.in (+1/-1)
debian/swift-container.swift-container-updater.upstart.in (+1/-1)
debian/swift-container.upstart.in (+1/-1)
debian/swift-object.swift-object-auditor.upstart.in (+1/-1)
debian/swift-object.swift-object-replicator.upstart.in (+1/-1)
debian/swift-object.swift-object-updater.upstart.in (+1/-1)
debian/swift-object.upstart.in (+1/-1)
To merge this branch: bzr merge lp:~james-page/swift/essex-fixup-upstart
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2012-03-15 Pending
Review via email: mp+97690@code.launchpad.net

Description of the Change

The upstart configurations in the swift packages seem to be pretty mangled for essex.

This update:

1) Ensures that all upstart configs are generated - the sub-configs where not being done
2) Updates the configurations to use new configuration file locations.

To post a comment you must log in.

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-03-09 18:26:10 +0000
3+++ debian/changelog 2012-03-15 16:12:24 +0000
4@@ -1,3 +1,12 @@
5+swift (1.4.7-0ubuntu2) precise; urgency=low
6+
7+ * Fixup upstart configurations (LP: #954477):
8+ - d/rules: Correctly generate ALL upstart configurations when
9+ building for Ubuntu.
10+ - d/*.upstart.in: Update upstart config's to use new conf file locations.
11+
12+ -- James Page <james.page@ubuntu.com> Thu, 15 Mar 2012 15:34:19 +0000
13+
14 swift (1.4.7-0ubuntu1) precise; urgency=low
15
16 [ Chuck Short ]
17
18=== modified file 'debian/rules'
19--- debian/rules 2012-01-09 11:30:05 +0000
20+++ debian/rules 2012-03-15 16:12:24 +0000
21@@ -36,18 +36,18 @@
22 override_dh_installinit:
23 if dpkg-vendor --derives-from ubuntu ; then \
24 for i in debian/*.upstart.in ; do \
25- MYPKG=`echo $$i | cut -d. -f1` ; \
26+ MYPKG=`echo $$i | sed 's/.upstart.in//'` ; \
27 cp $$MYPKG.upstart.in $$MYPKG.upstart ; \
28 done ; \
29 fi
30 dh_installinit --no-start
31
32 dh_installinit --no-start -pswift-container --name=swift-container-replicator
33+ dh_installinit --no-start -pswift-container --name=swift-container-auditor
34+ dh_installinit --no-start -pswift-container --name=swift-container-updater
35 dh_installinit --no-start -pswift-account --name=swift-account-replicator
36+ dh_installinit --no-start -pswift-account --name=swift-account-auditor
37 dh_installinit --no-start -pswift-account --name=swift-account-reaper
38+ dh_installinit --no-start -pswift-object --name=swift-object-replicator
39 dh_installinit --no-start -pswift-object --name=swift-object-auditor
40- dh_installinit --no-start -pswift-container --name=swift-container-auditor
41- dh_installinit --no-start -pswift-account --name=swift-account-auditor
42 dh_installinit --no-start -pswift-object --name=swift-object-updater
43- dh_installinit --no-start -pswift-object --name=swift-object-replicator
44- dh_installinit --no-start -pswift-container --name=swift-container-updater
45
46=== modified file 'debian/swift-account.swift-account-auditor.upstart.in'
47--- debian/swift-account.swift-account-auditor.upstart.in 2011-11-18 18:25:20 +0000
48+++ debian/swift-account.swift-account-auditor.upstart.in 2012-03-15 16:12:24 +0000
49@@ -9,7 +9,7 @@
50 stop on runlevel [016]
51
52 pre-start script
53- if [ $(find /etc/swift/account-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
54+ if [ -f "/etc/swift/account-server.conf" ]; then
55 exec /usr/bin/swift-init account-auditor start
56 else
57 exit 1
58
59=== modified file 'debian/swift-account.swift-account-reaper.upstart.in'
60--- debian/swift-account.swift-account-reaper.upstart.in 2011-11-18 18:25:20 +0000
61+++ debian/swift-account.swift-account-reaper.upstart.in 2012-03-15 16:12:24 +0000
62@@ -9,7 +9,7 @@
63 stop on runlevel [016]
64
65 pre-start script
66- if [ $(find /etc/swift/account-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
67+ if [ -f "/etc/swift/account-server.conf" ]; then
68 exec /usr/bin/swift-init account-reaper start
69 else
70 exit 1
71
72=== modified file 'debian/swift-account.swift-account-replicator.upstart.in'
73--- debian/swift-account.swift-account-replicator.upstart.in 2011-11-18 18:25:20 +0000
74+++ debian/swift-account.swift-account-replicator.upstart.in 2012-03-15 16:12:24 +0000
75@@ -9,7 +9,7 @@
76 stop on runlevel [016]
77
78 pre-start script
79- if [ $(find /etc/swift/account-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
80+ if [ -f "/etc/swift/account-server.conf" ]; then
81 exec /usr/bin/swift-init account-replicator start
82 else
83 exit 1
84
85=== modified file 'debian/swift-account.upstart.in'
86--- debian/swift-account.upstart.in 2011-11-18 18:25:20 +0000
87+++ debian/swift-account.upstart.in 2012-03-15 16:12:24 +0000
88@@ -9,7 +9,7 @@
89 stop on runlevel [016]
90
91 pre-start script
92- if [ $(find /etc/swift/account-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
93+ if [ -f "/etc/swift/account-server.conf" ]; then
94 exec /usr/bin/swift-init account-server start
95 else
96 exit 1
97
98=== modified file 'debian/swift-container.swift-container-auditor.upstart.in'
99--- debian/swift-container.swift-container-auditor.upstart.in 2011-11-18 18:25:20 +0000
100+++ debian/swift-container.swift-container-auditor.upstart.in 2012-03-15 16:12:24 +0000
101@@ -9,7 +9,7 @@
102 stop on runlevel [016]
103
104 pre-start script
105- if [ $(find /etc/swift/container-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
106+ if [ -f "/etc/swift/container-server.conf" ]; then
107 exec /usr/bin/swift-init container-auditor start
108 else
109 exit 1
110
111=== modified file 'debian/swift-container.swift-container-replicator.upstart.in'
112--- debian/swift-container.swift-container-replicator.upstart.in 2011-11-18 18:25:20 +0000
113+++ debian/swift-container.swift-container-replicator.upstart.in 2012-03-15 16:12:24 +0000
114@@ -9,7 +9,7 @@
115 stop on runlevel [016]
116
117 pre-start script
118- if [ $(find /etc/swift/container-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
119+ if [ -f "/etc/swift/container-server.conf" ]; then
120 exec /usr/bin/swift-init container-replicator start
121 else
122 exit 1
123
124=== modified file 'debian/swift-container.swift-container-updater.upstart.in'
125--- debian/swift-container.swift-container-updater.upstart.in 2011-11-18 18:25:20 +0000
126+++ debian/swift-container.swift-container-updater.upstart.in 2012-03-15 16:12:24 +0000
127@@ -9,7 +9,7 @@
128 stop on runlevel [016]
129
130 pre-start script
131- if [ $(find /etc/swift/container-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
132+ if [ -f "/etc/swift/container-server.conf" ]; then
133 exec /usr/bin/swift-init container-updater start
134 else
135 exit 1
136
137=== modified file 'debian/swift-container.upstart.in'
138--- debian/swift-container.upstart.in 2011-11-18 18:25:20 +0000
139+++ debian/swift-container.upstart.in 2012-03-15 16:12:24 +0000
140@@ -9,7 +9,7 @@
141 stop on runlevel [016]
142
143 pre-start script
144- if [ $(find /etc/swift/container-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
145+ if [ -f "/etc/swift/container-server.conf" ]; then
146 exec /usr/bin/swift-init container-server start
147 else
148 exit 1
149
150=== modified file 'debian/swift-object.swift-object-auditor.upstart.in'
151--- debian/swift-object.swift-object-auditor.upstart.in 2011-11-18 18:25:20 +0000
152+++ debian/swift-object.swift-object-auditor.upstart.in 2012-03-15 16:12:24 +0000
153@@ -9,7 +9,7 @@
154 stop on runlevel [016]
155
156 pre-start script
157- if [ $(find /etc/swift/object-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
158+ if [ -f "/etc/swift/object-server.conf" ]; then
159 exec /usr/bin/swift-init object-auditor start
160 else
161 exit 1
162
163=== modified file 'debian/swift-object.swift-object-replicator.upstart.in'
164--- debian/swift-object.swift-object-replicator.upstart.in 2011-11-18 18:25:20 +0000
165+++ debian/swift-object.swift-object-replicator.upstart.in 2012-03-15 16:12:24 +0000
166@@ -9,7 +9,7 @@
167 stop on runlevel [016]
168
169 pre-start script
170- if [ $(find /etc/swift/object-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
171+ if [ -f "/etc/swift/object-server.conf" ]; then
172 exec /usr/bin/swift-init object-replicator start
173 else
174 exit 1
175
176=== modified file 'debian/swift-object.swift-object-updater.upstart.in'
177--- debian/swift-object.swift-object-updater.upstart.in 2011-11-18 18:25:20 +0000
178+++ debian/swift-object.swift-object-updater.upstart.in 2012-03-15 16:12:24 +0000
179@@ -9,7 +9,7 @@
180 stop on runlevel [016]
181
182 pre-start script
183- if [ $(find /etc/swift/object-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
184+ if [ -f "/etc/swift/object-server.conf" ]; then
185 exec /usr/bin/swift-init object-updater start
186 else
187 exit 1
188
189=== modified file 'debian/swift-object.upstart.in'
190--- debian/swift-object.upstart.in 2011-11-18 18:25:20 +0000
191+++ debian/swift-object.upstart.in 2012-03-15 16:12:24 +0000
192@@ -9,7 +9,7 @@
193 stop on runlevel [016]
194
195 pre-start script
196- if [ $(find /etc/swift/object-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then
197+ if [ -f "/etc/swift/object-server.conf" ]; then
198 exec /usr/bin/swift-init object-server start
199 else
200 exit 1

Subscribers

People subscribed via source and target branches