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
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 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
=== modified file 'debian/changelog'
--- debian/changelog 2012-03-09 18:26:10 +0000
+++ debian/changelog 2012-03-15 16:12:24 +0000
@@ -1,3 +1,12 @@
1swift (1.4.7-0ubuntu2) precise; urgency=low
2
3 * Fixup upstart configurations (LP: #954477):
4 - d/rules: Correctly generate ALL upstart configurations when
5 building for Ubuntu.
6 - d/*.upstart.in: Update upstart config's to use new conf file locations.
7
8 -- James Page <james.page@ubuntu.com> Thu, 15 Mar 2012 15:34:19 +0000
9
1swift (1.4.7-0ubuntu1) precise; urgency=low10swift (1.4.7-0ubuntu1) precise; urgency=low
211
3 [ Chuck Short ]12 [ Chuck Short ]
413
=== modified file 'debian/rules'
--- debian/rules 2012-01-09 11:30:05 +0000
+++ debian/rules 2012-03-15 16:12:24 +0000
@@ -36,18 +36,18 @@
36override_dh_installinit:36override_dh_installinit:
37 if dpkg-vendor --derives-from ubuntu ; then \37 if dpkg-vendor --derives-from ubuntu ; then \
38 for i in debian/*.upstart.in ; do \38 for i in debian/*.upstart.in ; do \
39 MYPKG=`echo $$i | cut -d. -f1` ; \39 MYPKG=`echo $$i | sed 's/.upstart.in//'` ; \
40 cp $$MYPKG.upstart.in $$MYPKG.upstart ; \40 cp $$MYPKG.upstart.in $$MYPKG.upstart ; \
41 done ; \41 done ; \
42 fi42 fi
43 dh_installinit --no-start43 dh_installinit --no-start
44 44
45 dh_installinit --no-start -pswift-container --name=swift-container-replicator45 dh_installinit --no-start -pswift-container --name=swift-container-replicator
46 dh_installinit --no-start -pswift-container --name=swift-container-auditor
47 dh_installinit --no-start -pswift-container --name=swift-container-updater
46 dh_installinit --no-start -pswift-account --name=swift-account-replicator48 dh_installinit --no-start -pswift-account --name=swift-account-replicator
49 dh_installinit --no-start -pswift-account --name=swift-account-auditor
47 dh_installinit --no-start -pswift-account --name=swift-account-reaper50 dh_installinit --no-start -pswift-account --name=swift-account-reaper
51 dh_installinit --no-start -pswift-object --name=swift-object-replicator
48 dh_installinit --no-start -pswift-object --name=swift-object-auditor52 dh_installinit --no-start -pswift-object --name=swift-object-auditor
49 dh_installinit --no-start -pswift-container --name=swift-container-auditor
50 dh_installinit --no-start -pswift-account --name=swift-account-auditor
51 dh_installinit --no-start -pswift-object --name=swift-object-updater53 dh_installinit --no-start -pswift-object --name=swift-object-updater
52 dh_installinit --no-start -pswift-object --name=swift-object-replicator
53 dh_installinit --no-start -pswift-container --name=swift-container-updater
5454
=== modified file 'debian/swift-account.swift-account-auditor.upstart.in'
--- debian/swift-account.swift-account-auditor.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-account.swift-account-auditor.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/account-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/account-server.conf" ]; then
13 exec /usr/bin/swift-init account-auditor start13 exec /usr/bin/swift-init account-auditor start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-account.swift-account-reaper.upstart.in'
--- debian/swift-account.swift-account-reaper.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-account.swift-account-reaper.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/account-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/account-server.conf" ]; then
13 exec /usr/bin/swift-init account-reaper start13 exec /usr/bin/swift-init account-reaper start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-account.swift-account-replicator.upstart.in'
--- debian/swift-account.swift-account-replicator.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-account.swift-account-replicator.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/account-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/account-server.conf" ]; then
13 exec /usr/bin/swift-init account-replicator start13 exec /usr/bin/swift-init account-replicator start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-account.upstart.in'
--- debian/swift-account.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-account.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/account-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/account-server.conf" ]; then
13 exec /usr/bin/swift-init account-server start13 exec /usr/bin/swift-init account-server start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-container.swift-container-auditor.upstart.in'
--- debian/swift-container.swift-container-auditor.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-container.swift-container-auditor.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/container-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/container-server.conf" ]; then
13 exec /usr/bin/swift-init container-auditor start13 exec /usr/bin/swift-init container-auditor start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-container.swift-container-replicator.upstart.in'
--- debian/swift-container.swift-container-replicator.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-container.swift-container-replicator.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/container-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/container-server.conf" ]; then
13 exec /usr/bin/swift-init container-replicator start13 exec /usr/bin/swift-init container-replicator start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-container.swift-container-updater.upstart.in'
--- debian/swift-container.swift-container-updater.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-container.swift-container-updater.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/container-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/container-server.conf" ]; then
13 exec /usr/bin/swift-init container-updater start13 exec /usr/bin/swift-init container-updater start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-container.upstart.in'
--- debian/swift-container.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-container.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/container-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/container-server.conf" ]; then
13 exec /usr/bin/swift-init container-server start13 exec /usr/bin/swift-init container-server start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-object.swift-object-auditor.upstart.in'
--- debian/swift-object.swift-object-auditor.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-object.swift-object-auditor.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/object-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/object-server.conf" ]; then
13 exec /usr/bin/swift-init object-auditor start13 exec /usr/bin/swift-init object-auditor start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-object.swift-object-replicator.upstart.in'
--- debian/swift-object.swift-object-replicator.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-object.swift-object-replicator.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/object-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/object-server.conf" ]; then
13 exec /usr/bin/swift-init object-replicator start13 exec /usr/bin/swift-init object-replicator start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-object.swift-object-updater.upstart.in'
--- debian/swift-object.swift-object-updater.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-object.swift-object-updater.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/object-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/object-server.conf" ]; then
13 exec /usr/bin/swift-init object-updater start13 exec /usr/bin/swift-init object-updater start
14 else14 else
15 exit 115 exit 1
1616
=== modified file 'debian/swift-object.upstart.in'
--- debian/swift-object.upstart.in 2011-11-18 18:25:20 +0000
+++ debian/swift-object.upstart.in 2012-03-15 16:12:24 +0000
@@ -9,7 +9,7 @@
9stop on runlevel [016]9stop on runlevel [016]
1010
11pre-start script11pre-start script
12 if [ $(find /etc/swift/object-server/ -type f 2>/dev/null | wc -l) -gt 0 ]; then12 if [ -f "/etc/swift/object-server.conf" ]; then
13 exec /usr/bin/swift-init object-server start13 exec /usr/bin/swift-init object-server start
14 else14 else
15 exit 115 exit 1

Subscribers

People subscribed via source and target branches