openstack
/
glance
Code Issues Proposed changes

Text formatting changes 

These are some text fixes in document, scripts and functions,
including variable usage, text aligning, adding new store class in
document

Change-Id: I98e226969d86698972870a7b3a042cb00c2206e9
This commit is contained in:
Kun Huang 2013-07-24 13:51:52 +08:00
parent 463f322380
commit 485274433f
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.mailmap
View File

@ -8,7 +8,7 @@
<jsuh@isi.edu> <jsuh@bespin>
<josh@jk0.org> <josh.kearney@rackspace.com>
<lorin@nimbisservices.com> <lorin@isi.edu>
<rconradharris@gmail.com> <rick.harris@rackspace.com>
<rconradharris@gmail.com> <rick.harris@rackspace.com>
<rconradharris@gmail.com> <rick@quasar.racklabs.com>
<rick@openstack.org> <rclark@chat-blanc>
<soren.hansen@rackspace.com> <soren@linux2go.dk>
@ -17,4 +17,5 @@
<jeblair@hp.com> <james.blair@rackspace.com>
<chris@pistoncloud.com> <chris@slicehost.com>
<ken.pepple@gmail.com> <ken.pepple@rabbityard.com>
<gareth@unitedstack.com> <academicgareth@gmail.com>
Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>

4
doc/source/glanceapi.rst
View File

@ -404,8 +404,8 @@ The list of metadata headers that Glance accepts are listed below.
* ``x-image-meta-store``
This header is optional. Valid values are one of ``file``, ``s3``, or
``swift``
This header is optional. Valid values are one of ``file``, ``s3``, ``rbd``,
``swift``, ``cinder``, ``gridfs`` or ``sheepdog``
When present, Glance will attempt to store the disk image data in the
backing store indicated by the value of the header. If the Glance node

2
doc/source/man/glanceapi.rst
View File

@ -40,7 +40,7 @@ OPTIONS
**--default_store=STORE**
The default backend store that Glance should use when storing virtual
machine images. The default value is `filesystem`. Choices are any of
`filesystem`, `swift`, or `s3`
`filesystem`, `swift`, `rbd`, `cinder`, `gridfs`, `sheepdog` or `s3`
**--filesystem_store_datadir=DIR**
The directory that the `filesystem` backend store should use to write

2
glance/common/config.py
View File

@ -174,7 +174,7 @@ def _get_paste_config_path():
# to the last config file
path = CONF.config_file[-1].replace(conf_suffix, paste_suffix)
else:
path = CONF.prog + '-paste.ini'
path = CONF.prog + paste_suffix
return CONF.find_file(os.path.basename(path))

4
run_tests.sh
View File

@ -9,8 +9,8 @@ function usage {
echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added."
echo " -u, --update Update the virtual environment with any newer package versions"
echo " --unittests-only Run unit tests only, exclude functional tests."
echo " -p, --flake8 Just run flake8"
echo " -P, --no-flake8 Don't run static code checks"
echo " -p, --flake8 Just run flake8"
echo " -P, --no-flake8 Don't run static code checks"
echo " -h, --help Print this usage message"
echo ""
echo "Note: with no options specified, the script will try to run the tests in a virtual environment,"