OpenStack Object Storage (swift)

Merge lp:~zulcss/swift/icehouse-ftbfs into lp:~ubuntu-server-dev/swift/icehouse

  1. icehouse-ftbfs
  2. Merge into icehouse
Proposed by Chuck Short
Status: Merged
Approved by: Chuck Short
Approved revision: 155
Merged at revision: 155
Proposed branch: lp:~zulcss/swift/icehouse-ftbfs
Merge into: lp:~ubuntu-server-dev/swift/icehouse
Diff against target: 278 lines (+7/-202)
7 files modified
debian/changelog (+6/-0)
debian/rules (+1/-9)
debian/swift-account.init (+0/-45)
debian/swift-container.init (+0/-45)
debian/swift-doc.docs (+0/-1)
debian/swift-object.init (+0/-45)
debian/swift-proxy.init (+0/-57)
To merge this branch: bzr merge lp:~zulcss/swift/icehouse-ftbfs
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+197107@code.launchpad.net

Description of the change

swift ftbfs

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 2013-10-22 16:51:08 +0000
+++ debian/changelog 2013-11-28 18:28:09 +0000
@@ -1,6 +1,12 @@
1swift (1.10.0-0ubuntu2) UNRELEASED; urgency=low1swift (1.10.0-0ubuntu2) UNRELEASED; urgency=low
22
3 * debian/control: open icehouse release.3 * debian/control: open icehouse release.
4 * debian/rules:
5 - Fix doc installation.
6 - Removed debian distribution checking.
7 * Removed init scripts, they dont get installed anyways.
8 * Renamed upstart.in to regular upstart jobs.
9 * debian/swift-doc.docs: Drop doc/build/html.
410
5 -- Chuck Short <zulcss@ubuntu.com> Tue, 22 Oct 2013 09:51:08 -070011 -- Chuck Short <zulcss@ubuntu.com> Tue, 22 Oct 2013 09:51:08 -0700
612
713
=== modified file 'debian/rules'
--- debian/rules 2012-09-26 14:19:45 +0000
+++ debian/rules 2013-11-28 18:28:09 +0000
@@ -15,9 +15,8 @@
1515
16# build with sphinx documentation16# build with sphinx documentation
17override_dh_auto_build:17override_dh_auto_build:
18 dh_auto_build
19 mkdir -p doc/build18 mkdir -p doc/build
20 python setup.py build_sphinx19 python setup.py build
2120
22ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))21ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
23override_dh_auto_test:22override_dh_auto_test:
@@ -34,14 +33,7 @@
34 install -D -m 0640 $(CURDIR)/debian/object-server.conf $(CURDIR)/debian/swift-object/etc/swift/object-server.conf33 install -D -m 0640 $(CURDIR)/debian/object-server.conf $(CURDIR)/debian/swift-object/etc/swift/object-server.conf
3534
36override_dh_installinit:35override_dh_installinit:
37 if dpkg-vendor --derives-from ubuntu ; then \
38 for i in debian/*.upstart.in ; do \
39 MYPKG=`echo $$i | sed 's/.upstart.in//'` ; \
40 cp $$MYPKG.upstart.in $$MYPKG.upstart ; \
41 done ; \
42 fi
43 dh_installinit --no-start36 dh_installinit --no-start
44
45 dh_installinit --no-start -pswift-container --name=swift-container-replicator37 dh_installinit --no-start -pswift-container --name=swift-container-replicator
46 dh_installinit --no-start -pswift-container --name=swift-container-auditor38 dh_installinit --no-start -pswift-container --name=swift-container-auditor
47 dh_installinit --no-start -pswift-container --name=swift-container-updater39 dh_installinit --no-start -pswift-container --name=swift-container-updater
4840
=== removed file 'debian/swift-account.init'
--- debian/swift-account.init 2011-07-13 07:54:11 +0000
+++ debian/swift-account.init 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
1#! /bin/sh
2### BEGIN INIT INFO
3# Provides: swift-account
4# Required-Start: $remote_fs
5# Required-Stop: $remote_fs
6# Default-Start: 2 3 4 5
7# Default-Stop: 0 1 6
8# Short-Description: Swift account server
9# Description: Account server for swift.
10### END INIT INFO
11
12SERVICE_NAME="account-server"
13PRINT_NAME="account server"
14
15. /lib/lsb/init-functions
16
17if ! [ -x /usr/bin/swift-init ] ; then
18 exit 0
19fi
20
21case "$1" in
22start)
23 log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
24 /usr/bin/swift-init ${SERVICE_NAME} start
25 log_end_msg $?
26;;
27stop)
28 log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
29 /usr/bin/swift-init ${SERVICE_NAME} shutdown
30 log_end_msg $?
31;;
32restart|force-reload|reload)
33 log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
34 /usr/bin/swift-init ${SERVICE_NAME} reload
35;;
36status)
37 exec /usr/bin/swift-init ${SERVICE_NAME} status
38;;
39*)
40 echo "Usage: $0 {start|stop|restart|reload}"
41 exit 1
42;;
43esac
44
45exit 0
460
=== renamed file 'debian/swift-account.swift-account-auditor.upstart.in' => 'debian/swift-account.swift-account-auditor.upstart'
=== renamed file 'debian/swift-account.swift-account-reaper.upstart.in' => 'debian/swift-account.swift-account-reaper.upstart'
=== renamed file 'debian/swift-account.swift-account-replicator.upstart.in' => 'debian/swift-account.swift-account-replicator.upstart'
=== renamed file 'debian/swift-account.upstart.in' => 'debian/swift-account.upstart'
=== removed file 'debian/swift-container.init'
--- debian/swift-container.init 2011-07-13 07:54:11 +0000
+++ debian/swift-container.init 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
1#! /bin/sh
2### BEGIN INIT INFO
3# Provides: swift-container
4# Required-Start: $remote_fs
5# Required-Stop: $remote_fs
6# Default-Start: 2 3 4 5
7# Default-Stop: 0 1 6
8# Short-Description: Swift container server
9# Description: Container server for swift.
10### END INIT INFO
11
12SERVICE_NAME="container-server"
13PRINT_NAME="container server"
14
15. /lib/lsb/init-functions
16
17if ! [ -x /usr/bin/swift-init ] ; then
18 exit 0
19fi
20
21case "$1" in
22start)
23 log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
24 /usr/bin/swift-init ${SERVICE_NAME} start
25 log_end_msg $?
26;;
27stop)
28 log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
29 /usr/bin/swift-init ${SERVICE_NAME} stop
30 log_end_msg $?
31;;
32restart|force-reload|reload)
33 log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
34 /usr/bin/swift-init ${SERVICE_NAME} reload
35;;
36status)
37 exec /usr/bin/swift-init ${SERVICE_NAME} status
38;;
39*)
40 echo "Usage: $0 {start|stop|restart|reload}"
41 exit 1
42;;
43esac
44
45exit 0
460
=== renamed file 'debian/swift-container.swift-container-auditor.upstart.in' => 'debian/swift-container.swift-container-auditor.upstart'
=== renamed file 'debian/swift-container.swift-container-replicator.upstart.in' => 'debian/swift-container.swift-container-replicator.upstart'
=== renamed file 'debian/swift-container.swift-container-updater.upstart.in' => 'debian/swift-container.swift-container-updater.upstart'
=== renamed file 'debian/swift-container.upstart.in' => 'debian/swift-container.upstart'
=== modified file 'debian/swift-doc.docs'
--- debian/swift-doc.docs 2011-01-14 10:55:59 +0000
+++ debian/swift-doc.docs 2013-11-28 18:28:09 +0000
@@ -1,1 +0,0 @@
1doc/build/html
20
=== removed file 'debian/swift-object.init'
--- debian/swift-object.init 2011-07-13 07:54:11 +0000
+++ debian/swift-object.init 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
1#! /bin/sh
2### BEGIN INIT INFO
3# Provides: swift-object
4# Required-Start: $remote_fs
5# Required-Stop: $remote_fs
6# Default-Start: 2 3 4 5
7# Default-Stop: 0 1 6
8# Short-Description: Swift object server
9# Description: Object server for swift.
10### END INIT INFO
11
12SERVICE_NAME="object-server"
13PRINT_NAME="object server"
14
15. /lib/lsb/init-functions
16
17if ! [ -x /usr/bin/swift-init ] ; then
18 exit 0
19fi
20
21case "$1" in
22start)
23 log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
24 /usr/bin/swift-init ${SERVICE_NAME} start
25 log_end_msg $?
26;;
27stop)
28 log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
29 /usr/bin/swift-init ${SERVICE_NAME} shutdown
30 log_end_msg $?
31;;
32restart|force-reload|reload)
33 log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
34 /usr/bin/swift-init ${SERVICE_NAME} reload
35;;
36status)
37 exec /usr/bin/swift-init ${SERVICE_NAME} status
38;;
39*)
40 echo "Usage: $0 {start|stop|restart|reload}"
41 exit 1
42;;
43esac
44
45exit 0
460
=== renamed file 'debian/swift-object.swift-object-auditor.upstart.in' => 'debian/swift-object.swift-object-auditor.upstart'
=== renamed file 'debian/swift-object.swift-object-replicator.upstart.in' => 'debian/swift-object.swift-object-replicator.upstart'
=== renamed file 'debian/swift-object.swift-object-updater.upstart.in' => 'debian/swift-object.swift-object-updater.upstart'
=== renamed file 'debian/swift-object.upstart.in' => 'debian/swift-object.upstart'
=== removed file 'debian/swift-proxy.init'
--- debian/swift-proxy.init 2011-07-13 08:37:00 +0000
+++ debian/swift-proxy.init 1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
1#! /bin/sh
2### BEGIN INIT INFO
3# Provides: swift-proxy
4# Required-Start: $remote_fs
5# Required-Stop: $remote_fs
6# Default-Start: 2 3 4 5
7# Default-Stop: 0 1 6
8# Short-Description: Swift proxy server
9# Description: Proxy server for swift.
10### END INIT INFO
11
12set -e
13
14DAEMON="/usr/bin/swift-proxy-server"
15DAEMON_ARGS="/etc/swift/proxy-server.conf"
16SERVICE_NAME="swift-proxy-server"
17PRINT_NAME="Swift proxy server"
18SWIFT_USER=swift
19SWIFT_GRP=swift
20PID_FILE=/var/run/swift/proxy-server.pid
21PID_DIR=`dirname $PID_FILE`
22
23if ! [ -x ${DAEMON} ] ; then
24 exit 0
25fi
26
27mkdir -p ${PID_DIR}
28chown ${SWIFT_USER} ${PID_DIR}
29
30. /lib/lsb/init-functions
31
32case "$1" in
33start)
34 log_daemon_msg "Starting ${PRINT_NAME}" "${SERVICE_NAME}"
35 start-stop-daemon --start --chuid ${SWIFT_USER}:${SWIFT_GRP} -b -m --pidfile $PID_FILE --exec ${DAEMON} -- ${DAEMON_ARGS}
36 log_end_msg $?
37;;
38stop)
39 log_daemon_msg "Stopping ${PRINT_NAME}" "${SERVICE_NAME}"
40 start-stop-daemon --stop --oknodo --pidfile ${PID_FILE}
41 log_end_msg $?
42;;
43restart|force-reload|reload)
44 $0 stop
45 sleep 1
46 $0 start
47;;
48status)
49 status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
50;;
51*)
52 echo "Usage: $0 {start|stop|restart|reload}"
53 exit 1
54;;
55esac
56
57exit 0
580
=== renamed file 'debian/swift-proxy.upstart.in' => 'debian/swift-proxy.upstart'

Subscribers

People subscribed via source and target branches