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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-22 16:51:08 +0000
3+++ debian/changelog 2013-11-28 18:28:09 +0000
4@@ -1,6 +1,12 @@
5 swift (1.10.0-0ubuntu2) UNRELEASED; urgency=low
6
7 * debian/control: open icehouse release.
8+ * debian/rules:
9+ - Fix doc installation.
10+ - Removed debian distribution checking.
11+ * Removed init scripts, they dont get installed anyways.
12+ * Renamed upstart.in to regular upstart jobs.
13+ * debian/swift-doc.docs: Drop doc/build/html.
14
15 -- Chuck Short <zulcss@ubuntu.com> Tue, 22 Oct 2013 09:51:08 -0700
16
17
18=== modified file 'debian/rules'
19--- debian/rules 2012-09-26 14:19:45 +0000
20+++ debian/rules 2013-11-28 18:28:09 +0000
21@@ -15,9 +15,8 @@
22
23 # build with sphinx documentation
24 override_dh_auto_build:
25- dh_auto_build
26 mkdir -p doc/build
27- python setup.py build_sphinx
28+ python setup.py build
29
30 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
31 override_dh_auto_test:
32@@ -34,14 +33,7 @@
33 install -D -m 0640 $(CURDIR)/debian/object-server.conf $(CURDIR)/debian/swift-object/etc/swift/object-server.conf
34
35 override_dh_installinit:
36- if dpkg-vendor --derives-from ubuntu ; then \
37- for i in debian/*.upstart.in ; do \
38- MYPKG=`echo $$i | sed 's/.upstart.in//'` ; \
39- cp $$MYPKG.upstart.in $$MYPKG.upstart ; \
40- done ; \
41- fi
42 dh_installinit --no-start
43-
44 dh_installinit --no-start -pswift-container --name=swift-container-replicator
45 dh_installinit --no-start -pswift-container --name=swift-container-auditor
46 dh_installinit --no-start -pswift-container --name=swift-container-updater
47
48=== removed file 'debian/swift-account.init'
49--- debian/swift-account.init 2011-07-13 07:54:11 +0000
50+++ debian/swift-account.init 1970-01-01 00:00:00 +0000
51@@ -1,45 +0,0 @@
52-#! /bin/sh
53-### BEGIN INIT INFO
54-# Provides: swift-account
55-# Required-Start: $remote_fs
56-# Required-Stop: $remote_fs
57-# Default-Start: 2 3 4 5
58-# Default-Stop: 0 1 6
59-# Short-Description: Swift account server
60-# Description: Account server for swift.
61-### END INIT INFO
62-
63-SERVICE_NAME="account-server"
64-PRINT_NAME="account server"
65-
66-. /lib/lsb/init-functions
67-
68-if ! [ -x /usr/bin/swift-init ] ; then
69- exit 0
70-fi
71-
72-case "$1" in
73-start)
74- log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
75- /usr/bin/swift-init ${SERVICE_NAME} start
76- log_end_msg $?
77-;;
78-stop)
79- log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
80- /usr/bin/swift-init ${SERVICE_NAME} shutdown
81- log_end_msg $?
82-;;
83-restart|force-reload|reload)
84- log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
85- /usr/bin/swift-init ${SERVICE_NAME} reload
86-;;
87-status)
88- exec /usr/bin/swift-init ${SERVICE_NAME} status
89-;;
90-*)
91- echo "Usage: $0 {start|stop|restart|reload}"
92- exit 1
93-;;
94-esac
95-
96-exit 0
97
98=== renamed file 'debian/swift-account.swift-account-auditor.upstart.in' => 'debian/swift-account.swift-account-auditor.upstart'
99=== renamed file 'debian/swift-account.swift-account-reaper.upstart.in' => 'debian/swift-account.swift-account-reaper.upstart'
100=== renamed file 'debian/swift-account.swift-account-replicator.upstart.in' => 'debian/swift-account.swift-account-replicator.upstart'
101=== renamed file 'debian/swift-account.upstart.in' => 'debian/swift-account.upstart'
102=== removed file 'debian/swift-container.init'
103--- debian/swift-container.init 2011-07-13 07:54:11 +0000
104+++ debian/swift-container.init 1970-01-01 00:00:00 +0000
105@@ -1,45 +0,0 @@
106-#! /bin/sh
107-### BEGIN INIT INFO
108-# Provides: swift-container
109-# Required-Start: $remote_fs
110-# Required-Stop: $remote_fs
111-# Default-Start: 2 3 4 5
112-# Default-Stop: 0 1 6
113-# Short-Description: Swift container server
114-# Description: Container server for swift.
115-### END INIT INFO
116-
117-SERVICE_NAME="container-server"
118-PRINT_NAME="container server"
119-
120-. /lib/lsb/init-functions
121-
122-if ! [ -x /usr/bin/swift-init ] ; then
123- exit 0
124-fi
125-
126-case "$1" in
127-start)
128- log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
129- /usr/bin/swift-init ${SERVICE_NAME} start
130- log_end_msg $?
131-;;
132-stop)
133- log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
134- /usr/bin/swift-init ${SERVICE_NAME} stop
135- log_end_msg $?
136-;;
137-restart|force-reload|reload)
138- log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
139- /usr/bin/swift-init ${SERVICE_NAME} reload
140-;;
141-status)
142- exec /usr/bin/swift-init ${SERVICE_NAME} status
143-;;
144-*)
145- echo "Usage: $0 {start|stop|restart|reload}"
146- exit 1
147-;;
148-esac
149-
150-exit 0
151
152=== renamed file 'debian/swift-container.swift-container-auditor.upstart.in' => 'debian/swift-container.swift-container-auditor.upstart'
153=== renamed file 'debian/swift-container.swift-container-replicator.upstart.in' => 'debian/swift-container.swift-container-replicator.upstart'
154=== renamed file 'debian/swift-container.swift-container-updater.upstart.in' => 'debian/swift-container.swift-container-updater.upstart'
155=== renamed file 'debian/swift-container.upstart.in' => 'debian/swift-container.upstart'
156=== modified file 'debian/swift-doc.docs'
157--- debian/swift-doc.docs 2011-01-14 10:55:59 +0000
158+++ debian/swift-doc.docs 2013-11-28 18:28:09 +0000
159@@ -1,1 +0,0 @@
160-doc/build/html
161
162=== removed file 'debian/swift-object.init'
163--- debian/swift-object.init 2011-07-13 07:54:11 +0000
164+++ debian/swift-object.init 1970-01-01 00:00:00 +0000
165@@ -1,45 +0,0 @@
166-#! /bin/sh
167-### BEGIN INIT INFO
168-# Provides: swift-object
169-# Required-Start: $remote_fs
170-# Required-Stop: $remote_fs
171-# Default-Start: 2 3 4 5
172-# Default-Stop: 0 1 6
173-# Short-Description: Swift object server
174-# Description: Object server for swift.
175-### END INIT INFO
176-
177-SERVICE_NAME="object-server"
178-PRINT_NAME="object server"
179-
180-. /lib/lsb/init-functions
181-
182-if ! [ -x /usr/bin/swift-init ] ; then
183- exit 0
184-fi
185-
186-case "$1" in
187-start)
188- log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
189- /usr/bin/swift-init ${SERVICE_NAME} start
190- log_end_msg $?
191-;;
192-stop)
193- log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
194- /usr/bin/swift-init ${SERVICE_NAME} shutdown
195- log_end_msg $?
196-;;
197-restart|force-reload|reload)
198- log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
199- /usr/bin/swift-init ${SERVICE_NAME} reload
200-;;
201-status)
202- exec /usr/bin/swift-init ${SERVICE_NAME} status
203-;;
204-*)
205- echo "Usage: $0 {start|stop|restart|reload}"
206- exit 1
207-;;
208-esac
209-
210-exit 0
211
212=== renamed file 'debian/swift-object.swift-object-auditor.upstart.in' => 'debian/swift-object.swift-object-auditor.upstart'
213=== renamed file 'debian/swift-object.swift-object-replicator.upstart.in' => 'debian/swift-object.swift-object-replicator.upstart'
214=== renamed file 'debian/swift-object.swift-object-updater.upstart.in' => 'debian/swift-object.swift-object-updater.upstart'
215=== renamed file 'debian/swift-object.upstart.in' => 'debian/swift-object.upstart'
216=== removed file 'debian/swift-proxy.init'
217--- debian/swift-proxy.init 2011-07-13 08:37:00 +0000
218+++ debian/swift-proxy.init 1970-01-01 00:00:00 +0000
219@@ -1,57 +0,0 @@
220-#! /bin/sh
221-### BEGIN INIT INFO
222-# Provides: swift-proxy
223-# Required-Start: $remote_fs
224-# Required-Stop: $remote_fs
225-# Default-Start: 2 3 4 5
226-# Default-Stop: 0 1 6
227-# Short-Description: Swift proxy server
228-# Description: Proxy server for swift.
229-### END INIT INFO
230-
231-set -e
232-
233-DAEMON="/usr/bin/swift-proxy-server"
234-DAEMON_ARGS="/etc/swift/proxy-server.conf"
235-SERVICE_NAME="swift-proxy-server"
236-PRINT_NAME="Swift proxy server"
237-SWIFT_USER=swift
238-SWIFT_GRP=swift
239-PID_FILE=/var/run/swift/proxy-server.pid
240-PID_DIR=`dirname $PID_FILE`
241-
242-if ! [ -x ${DAEMON} ] ; then
243- exit 0
244-fi
245-
246-mkdir -p ${PID_DIR}
247-chown ${SWIFT_USER} ${PID_DIR}
248-
249-. /lib/lsb/init-functions
250-
251-case "$1" in
252-start)
253- log_daemon_msg "Starting ${PRINT_NAME}" "${SERVICE_NAME}"
254- start-stop-daemon --start --chuid ${SWIFT_USER}:${SWIFT_GRP} -b -m --pidfile $PID_FILE --exec ${DAEMON} -- ${DAEMON_ARGS}
255- log_end_msg $?
256-;;
257-stop)
258- log_daemon_msg "Stopping ${PRINT_NAME}" "${SERVICE_NAME}"
259- start-stop-daemon --stop --oknodo --pidfile ${PID_FILE}
260- log_end_msg $?
261-;;
262-restart|force-reload|reload)
263- $0 stop
264- sleep 1
265- $0 start
266-;;
267-status)
268- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
269-;;
270-*)
271- echo "Usage: $0 {start|stop|restart|reload}"
272- exit 1
273-;;
274-esac
275-
276-exit 0
277
278=== renamed file 'debian/swift-proxy.upstart.in' => 'debian/swift-proxy.upstart'

Subscribers

People subscribed via source and target branches