OpenStack Identity (keystone)

Merge lp:~gandelman-a/keystone/manpage-fix into lp:~openstack-ubuntu-testing/keystone/grizzly

  1. manpage-fix
  2. Merge into grizzly
Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 165
Merge reported by: Adam Gandelman
Merged at revision: not available
Proposed branch: lp:~gandelman-a/keystone/manpage-fix
Merge into: lp:~openstack-ubuntu-testing/keystone/grizzly
Diff against target: 322 lines (+8/-268)
7 files modified
debian/changelog (+7/-2)
debian/keystone.manpages (+1/-1)
debian/man/keystone-admin.8 (+0/-63)
debian/man/keystone-auth.8 (+0/-63)
debian/man/keystone-control.8 (+0/-63)
debian/man/keystone-import.8 (+0/-12)
debian/man/keystone.8 (+0/-64)
To merge this branch: bzr merge lp:~gandelman-a/keystone/manpage-fix
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+138289@code.launchpad.net

Description of the change

We've been installing our own manpages for binaries that no longer exist from the pre-redux days. These are now auto generated by sphinx, so lets use em.

To post a comment you must log in.
Revision history for this message
Chuck Short (zulcss) wrote :

lgtm

lp:~gandelman-a/keystone/manpage-fix updated
166. By Adam Gandelman

Drop old manpages.

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-11-25 23:10:56 +0000
3+++ debian/changelog 2012-12-05 19:19:22 +0000
4@@ -1,5 +1,6 @@
5-keystone (2013.1~g1-0ubuntu2) UNRELEASED; urgency=low
6+keystone (2013.1~g1-0ubuntu3) UNRELEASED; urgency=low
7
8+ [ James Page ]
9 * Re-enable gating of package build based on successful unit testing:
10 - d/tests/test_overrides.conf: Fixup test configuration to use
11 correct certificate locations.
12@@ -14,7 +15,11 @@
13 appropriate runlevel transitions, use start-stop-daemon to startup
14 keystone daemon.
15
16- -- James Page <james.page@ubuntu.com> Fri, 23 Nov 2012 21:34:05 +0000
17+ [ Adam Gandelman ]
18+ * debian/keystone.manpages: Install sphinx-generated manpages instead
19+ of our own outdated and unneeded versions. (LP: #1082050)
20+
21+ -- Adam Gandelman <adamg@ubuntu.com> Wed, 05 Dec 2012 10:44:19 -0800
22
23 keystone (2013.1~g1-0ubuntu1) raring; urgency=low
24
25
26=== modified file 'debian/keystone.manpages'
27--- debian/keystone.manpages 2011-12-15 19:19:30 +0000
28+++ debian/keystone.manpages 2012-12-05 19:19:22 +0000
29@@ -1,1 +1,1 @@
30-debian/man/*
31+doc/build/man/*
32
33=== removed directory 'debian/man'
34=== removed file 'debian/man/keystone-admin.8'
35--- debian/man/keystone-admin.8 2012-11-25 22:38:15 +0000
36+++ debian/man/keystone-admin.8 1970-01-01 00:00:00 +0000
37@@ -1,63 +0,0 @@
38-.TH keystone 8
39-.SH NAME
40-keystone-admin \- provides HTTP for administrators.
41-.SH SYNOPSIS
42-.I [OPTION]...
43-.SH DESCRIPTION
44-.BR keystone is a Python implementation of the Openstack
45-identity service.
46-.TP
47-.B --version
48-show program's version number and exit
49-.TP
50-.B \-h, --help
51-show help messag and exit
52-.TP
53-.B \-v, --verbose
54-Print more verbose output
55-.TP
56-.B \-d, --debug
57-Prrint debugging output to console.
58-.TP
59-.B \-c PATH, --config-file=PATH
60-Path to the config file to use. When not specified (the default),
61-we generally look at the first argument specified to be a config file,
62-and if that is also missing, we search standard directories for a config
63-file.
64-.TP
65-.B \-p BIND_PORT, --port=BIND_PORT, --bind-port=BIND_PORT
66-Specifies port to listen on.
67-.TP
68-.B --host=BIND_HOST, --bind-host=BIND_HOST
69-Specifies host address to listen on (default is all or 0.0.0.0)
70-.TP
71-.B \-t, --trace-calls
72-Turns on call tracing for troubleshooting
73-.TP
74-.B \-a PORT, --admin-port=PORT
75-Specifies port for Admin API to listen on (default is
76-35357)
77-.TP
78-.B --log-config=PATH
79-If this opion is specified, the logging configuration
80-file specified is used and overrides any other logging
81-options specified. Please see the Python logging
82-modules documentation for details on logging
83-confgiuration files.
84-.TP
85-.B --log-date-format=FORMAT
86-Format string for %(asctime)s in log records.
87-Default: %Y-%m-%d %H:%M:%S
88-.TP
89-.B --log-file=PATH
90-(Optional) Name of log file to output to. If not set,
91-logging will go to stdout.
92-.TP
93-.B --log-dir=LOG_DIR
94-(Optional) The directory to keep log files in (will
95-be prepended to \-\-logfile)
96-
97-.SH FILES
98-.IR /etc/keystone/keystone.conf
99-.SH AUTHOR
100-This manual page was written by Chuck Short <zulcss@ubuntu.com>.
101
102=== removed file 'debian/man/keystone-auth.8'
103--- debian/man/keystone-auth.8 2012-11-25 22:38:15 +0000
104+++ debian/man/keystone-auth.8 1970-01-01 00:00:00 +0000
105@@ -1,63 +0,0 @@
106-.TH keystone 8
107-.SH NAME
108-keystone-auth \- provides HTTP for users.
109-.SH SYNOPSIS
110-.I [OPTION]...
111-.SH DESCRIPTION
112-.BR keystone is a Python implementation of the Openstack
113-identity service.
114-.TP
115-.B --version
116-show program's version number and exit
117-.TP
118-.B \-h, --help
119-show help messag and exit
120-.TP
121-.B \-v, --verbose
122-Print more verbose output
123-.TP
124-.B \-d, --debug
125-Prrint debugging output to console.
126-.TP
127-.B \-c PATH, --config-file=PATH
128-Path to the config file to use. When not specified (the default),
129-we generally look at the first argument specified to be a config file,
130-and if that is also missing, we search standard directories for a config
131-file.
132-.TP
133-.B \-p BIND_PORT, --port=BIND_PORT, --bind-port=BIND_PORT
134-Specifies port to listen on.
135-.TP
136-.B --host=BIND_HOST, --bind-host=BIND_HOST
137-Specifies host address to listen on (default is all or 0.0.0.0)
138-.TP
139-.B \-t, --trace-calls
140-Turns on call tracing for troubleshooting
141-.TP
142-.B \-a PORT, --admin-port=PORT
143-Specifies port for Admin API to listen on (default is
144-35357)
145-.TP
146-.B --log-config=PATH
147-If this opion is specified, the logging configuration
148-file specified is used and overrides any other logging
149-options specified. Please see the Python logging
150-modules documentation for details on logging
151-confgiuration files.
152-.TP
153-.B --log-date-format=FORMAT
154-Format string for %(asctime)s in log records.
155-Default: %Y-%m-%d %H:%M:%S
156-.TP
157-.B --log-file=PATH
158-(Optional) Name of log file to output to. If not set,
159-logging will go to stdout.
160-.TP
161-.B --log-dir=LOG_DIR
162-(Optional) The directory to keep log files in (will
163-be prepended to \-\-logfile)
164-
165-.SH FILES
166-.IR /etc/keystone/keystone.conf
167-.SH AUTHOR
168-This manual page was written by Chuck Short <zulcss@ubuntu.com>.
169
170=== removed file 'debian/man/keystone-control.8'
171--- debian/man/keystone-control.8 2012-11-25 22:38:15 +0000
172+++ debian/man/keystone-control.8 1970-01-01 00:00:00 +0000
173@@ -1,63 +0,0 @@
174-.TH keystone 8
175-.SH NAME
176-keystone \- Starts/Stops keystone server.
177-.SH SYNOPSIS
178-.I [OPTION]...
179-.SH DESCRIPTION
180-.BR keystone is a Python implementation of the Openstack
181-identity service.
182-.TP
183-.B --version
184-show program's version number and exit
185-.TP
186-.B \-h, --help
187-show help messag and exit
188-.TP
189-.B \-v, --verbose
190-Print more verbose output
191-.TP
192-.B \-d, --debug
193-Prrint debugging output to console.
194-.TP
195-.B \-c PATH, --config-file=PATH
196-Path to the config file to use. When not specified (the default),
197-we generally look at the first argument specified to be a config file,
198-and if that is also missing, we search standard directories for a config
199-file.
200-.TP
201-.B \-p BIND_PORT, --port=BIND_PORT, --bind-port=BIND_PORT
202-Specifies port to listen on.
203-.TP
204-.B --host=BIND_HOST, --bind-host=BIND_HOST
205-Specifies host address to listen on (default is all or 0.0.0.0)
206-.TP
207-.B \-t, --trace-calls
208-Turns on call tracing for troubleshooting
209-.TP
210-.B \-a PORT, --admin-port=PORT
211-Specifies port for Admin API to listen on (default is
212-35357)
213-.TP
214-.B --log-config=PATH
215-If this opion is specified, the logging configuration
216-file specified is used and overrides any other logging
217-options specified. Please see the Python logging
218-modules documentation for details on logging
219-confgiuration files.
220-.TP
221-.B --log-date-format=FORMAT
222-Format string for %(asctime)s in log records.
223-Default: %Y-%m-%d %H:%M:%S
224-.TP
225-.B --log-file=PATH
226-(Optional) Name of log file to output to. If not set,
227-logging will go to stdout.
228-.TP
229-.B --log-dir=LOG_DIR
230-(Optional) The directory to keep log files in (will
231-be prepended to \-\-logfile)
232-
233-.SH FILES
234-.IR /etc/keystone/keystone.conf
235-.SH AUTHOR
236-This manual page was written by Chuck Short <zulcss@ubuntu.com>.
237
238=== removed file 'debian/man/keystone-import.8'
239--- debian/man/keystone-import.8 2012-06-22 16:27:53 +0000
240+++ debian/man/keystone-import.8 1970-01-01 00:00:00 +0000
241@@ -1,12 +0,0 @@
242-.TH keystone 8
243-.SH NAME
244-keystone-import \- import users, tenants, and EC2 credentials from nova.
245-.SH SYNOPSIS
246-.I [OPTION]...
247-.SH DESCRIPTION
248-.BR keystone is a Python implementation of the Openstack
249-identity service.
250-.SH FILES
251-.IR /etc/keystone/keystone.conf
252-.SH AUTHOR
253-This manual page was written by Chuck Short <zulcss@ubuntu.com>.
254
255=== removed file 'debian/man/keystone.8'
256--- debian/man/keystone.8 2012-11-25 22:38:15 +0000
257+++ debian/man/keystone.8 1970-01-01 00:00:00 +0000
258@@ -1,64 +0,0 @@
259-.TH keystone 8
260-.SH NAME
261-keystone \- provides HTTP for administrators and users.
262-.SH SYNOPSIS
263-.I [OPTION]...
264-.SH DESCRIPTION
265-.B keystone is a Python implementation of the Openstack
266-.B identity service. This version has a lack of SSL support.
267-.B It should not be run on a trusted network.
268-.TP
269-.B --version
270-show program's version number and exit
271-.TP
272-.B \-h, --help
273-show help messag and exit
274-.TP
275-.B \-v, --verbose
276-Print more verbose output
277-.TP
278-.B \-d, --debug
279-Prrint debugging output to console.
280-.TP
281-.B \-c PATH, --config-file=PATH
282-Path to the config file to use. When not specified (the default),
283-we generally look at the first argument specified to be a config file,
284-and if that is also missing, we search standard directories for a config
285-file.
286-.TP
287-.B \-p BIND_PORT, --port=BIND_PORT, --bind-port=BIND_PORT
288-Specifies port to listen on.
289-.TP
290-.B --host=BIND_HOST, --bind-host=BIND_HOST
291-Specifies host address to listen on (default is all or 0.0.0.0)
292-.TP
293-.B \-t, --trace-calls
294-Turns on call tracing for troubleshooting
295-.TP
296-.B \-a PORT, --admin-port=PORT
297-Specifies port for Admin API to listen on (default is
298-35357)
299-.TP
300-.B --log-config=PATH
301-If this opion is specified, the logging configuration
302-file specified is used and overrides any other logging
303-options specified. Please see the Python logging
304-modules documentation for details on logging
305-confgiuration files.
306-.TP
307-.B --log-date-format=FORMAT
308-Format string for %(asctime)s in log records.
309-Default: %Y-%m-%d %H:%M:%S
310-.TP
311-.B --log-file=PATH
312-(Optional) Name of log file to output to. If not set,
313-logging will go to stdout.
314-.TP
315-.B --log-dir=LOG_DIR
316-(Optional) The directory to keep log files in (will
317-be prepended to \-\-logfile)
318-
319-.SH FILES
320-.IR /etc/keystone/keystone.conf
321-.SH AUTHOR
322-This manual page was written by Chuck Short <zulcss@ubuntu.com>.

Subscribers

People subscribed via source and target branches