openstack/deb-swift
Code Issues Proposed changes

keep consistent naming convention of swift and urls

Browse Source 
Change-Id: Iddd4f69abf77a5c643ce8b164fc6cfd72c068229
This commit is contained in:
lijunbo 2017-03-20 14:32:00 +08:00 committed by junboli
parent 5c0814daa6
commit 21396bc106
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/manpages/swift-account-audit.1
View File

@ -28,7 +28,7 @@ swift\-account\-audit \- manually audit OpenStack Swift accounts
The swift-account-audit cli tool can be used to audit the data for an account. The swift-account-audit cli tool can be used to audit the data for an account.
It crawls the account, checking that all containers and objects can be found. It crawls the account, checking that all containers and objects can be found.
You can also feed a list of urls to the script through stdin. You can also feed a list of URLs to the script through stdin.
.SH OPTIONS .SH OPTIONS
.TP .TP
@ -39,7 +39,7 @@ Set the concurrency, default 50
Ring locations, default \fI/etc/swift\fR Ring locations, default \fI/etc/swift\fR
.TP .TP
\fB\-e\fR \fIfilename\fR \fB\-e\fR \fIfilename\fR
File for writing a list of inconsistent urls File for writing a list of inconsistent URLs
.TP .TP
\fB\-d\fR \fB\-d\fR
Also download files and verify md5 Also download files and verify md5

10
doc/source/admin_guide.rst
View File

@ -49,7 +49,7 @@ ring building server **last** after all Swift nodes have been successfully
upgraded, or refrain from generating rings until all Swift nodes have upgraded, or refrain from generating rings until all Swift nodes have
been successfully upgraded. been successfully upgraded.
If you need to downgrade from a version of swift greater than 1.6.0 to If you need to downgrade from a version of Swift greater than 1.6.0 to
a version less than or equal to 1.6.0, first downgrade your ring-building a version less than or equal to 1.6.0, first downgrade your ring-building
server, generate new rings, push them out, then continue with the rest server, generate new rings, push them out, then continue with the rest
of the downgrade. of the downgrade.
@ -202,7 +202,7 @@ Handling Drive Failure
---------------------- ----------------------
In the event that a drive has failed, the first step is to make sure the drive In the event that a drive has failed, the first step is to make sure the drive
is unmounted. This will make it easier for swift to work around the failure is unmounted. This will make it easier for Swift to work around the failure
until it has been resolved. If the drive is going to be replaced immediately, until it has been resolved. If the drive is going to be replaced immediately,
then it is just best to replace the drive, format it, remount it, and let then it is just best to replace the drive, format it, remount it, and let
replication fill it up. replication fill it up.
@ -232,7 +232,7 @@ Handling Server Failure
----------------------- -----------------------
If a server is having hardware issues, it is a good idea to make sure the If a server is having hardware issues, it is a good idea to make sure the
swift services are not running. This will allow Swift to work around the Swift services are not running. This will allow Swift to work around the
failure while you troubleshoot. failure while you troubleshoot.
If the server just needs a reboot, or a small amount of work that should If the server just needs a reboot, or a small amount of work that should
@ -673,7 +673,7 @@ account-server.conf sample::
The recon_cache_path simply sets the directory where stats for a few items will The recon_cache_path simply sets the directory where stats for a few items will
be stored. Depending on the method of deployment you may need to create this be stored. Depending on the method of deployment you may need to create this
directory manually and ensure that swift has read/write access. directory manually and ensure that Swift has read/write access.
Finally, if you also wish to track asynchronous pending on your object Finally, if you also wish to track asynchronous pending on your object
servers you will need to setup a cronjob to run the swift-recon-cron script servers you will need to setup a cronjob to run the swift-recon-cron script
@ -1325,7 +1325,7 @@ Managing Services
----------------- -----------------
Swift services are generally managed with `swift-init`. the general usage is Swift services are generally managed with `swift-init`. the general usage is
``swift-init <service> <command>``, where service is the swift service to ``swift-init <service> <command>``, where service is the Swift service to
manage (for example object, container, account, proxy) and command is one of: manage (for example object, container, account, proxy) and command is one of:
========== =============================================== ========== ===============================================

2
doc/source/deployment_guide.rst
View File

@ -1825,7 +1825,7 @@ auth_prefix /auth/ The HTTP request path
token_life 86400 The number of seconds a token_life 86400 The number of seconds a
token is valid. token is valid.
storage_url_scheme default Scheme to return with storage_url_scheme default Scheme to return with
storage urls: http, storage URLs: http,
https, or default https, or default
(chooses based on what (chooses based on what
the server is running the server is running

8
etc/proxy-server.conf-sample
View File

@ -69,7 +69,7 @@ bind_port = 8080
# log_statsd_sample_rate_factor = 1.0 # log_statsd_sample_rate_factor = 1.0
# log_statsd_metric_prefix = # log_statsd_metric_prefix =
# #
# Use a comma separated list of full url (http://foo.bar:1234,https://foo.bar) # Use a comma separated list of full URL (http://foo.bar:1234,https://foo.bar)
# cors_allow_origin = # cors_allow_origin =
# strict_cors_mode = True # strict_cors_mode = True
# #
@ -286,7 +286,7 @@ use = egg:swift#tempauth
# you can set this to false. # you can set this to false.
# allow_overrides = true # allow_overrides = true
# #
# This specifies what scheme to return with storage urls: # This specifies what scheme to return with storage URLs:
# http, https, or default (chooses based on what the server is running as) # http, https, or default (chooses based on what the server is running as)
# This can be useful with an SSL load balancer in front of a non-SSL server. # This can be useful with an SSL load balancer in front of a non-SSL server.
# storage_url_scheme = default # storage_url_scheme = default
@ -757,8 +757,8 @@ use = egg:swift#gatekeeper
[filter:container_sync] [filter:container_sync]
use = egg:swift#container_sync use = egg:swift#container_sync
# Set this to false if you want to disallow any full url values to be set for # Set this to false if you want to disallow any full URL values to be set for
# any new X-Container-Sync-To headers. This will keep any new full urls from # any new X-Container-Sync-To headers. This will keep any new full URLs from
# coming in, but won't change any existing values already in the cluster. # coming in, but won't change any existing values already in the cluster.
# Updating those will have to be done manually, as knowing what the true realm # Updating those will have to be done manually, as knowing what the true realm
# endpoint should be cannot always be guessed. # endpoint should be cannot always be guessed.