From 5dd25f4d6e4dad29b8494a9b1cf0c0099a603caa Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 21 Sep 2013 19:14:40 +0200 Subject: [PATCH] Fix whitespace Fix issues noted by validate.py Change-Id: I788bc6173f153375245a982974ace5b59af49219 --- doc/admin-guide-cloud/ch_networking.xml | 28 +++++++++---------- .../section_object-storage-admin.xml | 4 +-- doc/common/section_about-object-storage.xml | 4 +-- doc/common/section_baremetal.xml | 2 +- doc/common/section_docker.xml | 4 +-- .../drivers/ibm-gpfs-volume-driver.xml | 22 +++++++-------- .../section_dashboard_admin_manage_images.xml | 2 +- ...section_dashboard_admin_manage_volumes.xml | 2 +- .../section_nova_specify_host.xml | 2 +- .../section_swift_cli_analyze_log_files.xml | 27 +++++++++--------- 10 files changed, 49 insertions(+), 48 deletions(-) diff --git a/doc/admin-guide-cloud/ch_networking.xml b/doc/admin-guide-cloud/ch_networking.xml index 5d0394743f..19ae3d5c47 100644 --- a/doc/admin-guide-cloud/ch_networking.xml +++ b/doc/admin-guide-cloud/ch_networking.xml @@ -515,7 +515,7 @@ connectivity on behalf of tenants. - A tenant or cloud administrator can both perform the + A tenant or cloud administrator can both perform the following procedures.
Core Networking API features @@ -620,7 +620,7 @@ string None Human-readable name for this network; - is not required to be unique. + is not required to be unique. shared @@ -630,7 +630,7 @@ resource can be accessed by any tenant. The default policy setting restricts usage of this attribute to - administrative users only. + administrative users only. status @@ -644,7 +644,7 @@ list(uuid-str) Empty list List of subnets associated with this - network. + network. tenant_id @@ -680,7 +680,7 @@ cidr, excluding gateway_ip - (if configured). + (if configured). List of cidr sub-ranges that are available for dynamic allocation to ports. Syntax: @@ -743,7 +743,7 @@ string None Human-readable name for this subnet - (might not be unique). + (might not be unique). network_id @@ -759,7 +759,7 @@ Owner of network. Only administrative users can set the tenant identifier; this cannot be changed using - authorization policies. + authorization policies. @@ -784,7 +784,7 @@ true Administrative state of this port. If specified as False (down), this port - does not forward packets. + does not forward packets. device_id @@ -827,21 +827,21 @@ string None Human-readable name for this port - (might not be unique). + (might not be unique). network_id uuid-string N/A Network with which this port is - associated. + associated. status string N/A Indicates whether the network is - currently operational. + currently operational. tenant_id @@ -1116,7 +1116,7 @@ tenant who submits the request (without the --nic - option). + option). $ nova boot --image img --flavor flavor vm-name @@ -1569,7 +1569,7 @@ N/A Owner of the router. Only admin users can specify a tenant_id other than its - own. + own. external_gateway_info @@ -2508,7 +2508,7 @@ default_notification_level = INFO # Defined in rpc_notifier for rpc way, can be comma separated values. # The actual topic names will be %s.%(default_notification_level)s -notification_topics = notifications +notification_topics = notifications
diff --git a/doc/admin-guide-cloud/section_object-storage-admin.xml b/doc/admin-guide-cloud/section_object-storage-admin.xml index b412925f8f..19f30bc264 100644 --- a/doc/admin-guide-cloud/section_object-storage-admin.xml +++ b/doc/admin-guide-cloud/section_object-storage-admin.xml @@ -1,5 +1,5 @@ -
Refer to the OpenStack Configuration Reference for a listing of all configuration options for OpenStack Object Storage. -
\ No newline at end of file +
diff --git a/doc/common/section_about-object-storage.xml b/doc/common/section_about-object-storage.xml index 0ee0a8689e..f82115b3ae 100644 --- a/doc/common/section_about-object-storage.xml +++ b/doc/common/section_about-object-storage.xml @@ -1,8 +1,8 @@
Introduction to OpenStack Object Storage OpenStack Object Storage is a scalable object storage system - it is not a file system in the diff --git a/doc/common/section_baremetal.xml b/doc/common/section_baremetal.xml index 1895f401fa..f48738d5c9 100644 --- a/doc/common/section_baremetal.xml +++ b/doc/common/section_baremetal.xml @@ -17,7 +17,7 @@ xml:id="baremetal"> APIs and tools, such as Heat or salt-cloud. However, due to this unique situation, using the baremetal driver requires some additional preparation of its environment, the details of which are beyond the - scope of this guide. + scope of this guide. Some OpenStack Compute features are not implemented by the baremetal hypervisor driver. See the Docker Driver - The Docker driver is a hypervisor driver for OpenStack Compute, + The Docker driver is a hypervisor driver for OpenStack Compute, introduced with the Havana release. Docker is an open-source engine which automates the deployment of applications as highly portable, self-sufficient containers which are independent of hardware, language, framework, packaging @@ -23,7 +23,7 @@ xml:id="docker"> sense that they are better for specific use cases. Compute's support for VMs is currently advanced thanks to the variety of hypervisors running VMs. However it's not the case for containers even though libvirt/LXC is a good - starting point. Docker aims to go the second level of integration. + starting point. Docker aims to go the second level of integration. Some OpenStack Compute features are not implemented by the docker driver. See the This driver enables the use of GPFS in a similar fashion as the NFS driver. With the GPFS driver, instances do not actually access a storage device at the block level. Instead, volume backing files are created in a GPFS file system and mapped to instances, - which emulate a block device. + which emulate a block device. GPFS software must be installed and running on nodes where Cinder volume and Nova compute services are running in the OpenStack environment. A GPFS file system must also be created and mounted on these nodes before starting the cinder-volume service. The details of these GPFS specific - steps are covered in GPFS Administration documentation. + steps are covered in GPFS Administration documentation. Optionally, Glance can be configured to store images on a GPFS file system. When @@ -28,7 +28,7 @@ volumes using copy on write optimization strategy.
- Enabling the GPFS Driver + Enabling the GPFS Driver To use Cinder with the GPFS driver, first set the volume_driver in cinder.conf: volume_driver = cinder.volume.drivers.gpfs.GPFSDriver @@ -36,11 +36,11 @@ driver. - The flag gpfs_images_share_mode is only valid if the Image service - is configured to use GPFS with gpfs_images_dir flag. Also note, - when the value of this flag is copy_on_write, the paths - specified by the flags gpfs_mount_point_base and - gpfs_images_dir must both reside in the same GPFS file system + The flag gpfs_images_share_mode is only valid if the Image service + is configured to use GPFS with gpfs_images_dir flag. Also note, + when the value of this flag is copy_on_write, the paths + specified by the flags gpfs_mount_point_base and + gpfs_images_dir must both reside in the same GPFS file system and in the same GPFS fileset. @@ -105,7 +105,7 @@ Specify the allocation policy to be used for the volume file. Note that this option only works if "allow-write-affinity" is set for the - GPFS data pool. + GPFS data pool. @@ -113,7 +113,7 @@ Specify how many blocks are laid out sequentially in the volume file to behave like a single large block. This option only works if - "allow-write-affinity" is set for the GPFS data pool. + "allow-write-affinity" is set for the GPFS data pool. @@ -142,7 +142,7 @@ Volume snapshots are implemented using the GPFS file clone feature. Whenever a new snapshot is created, the snapshot file is efficiently created as a read-only clone parent of the volume, and the volume file uses copy on write optimization strategy - to minimize data movement. + to minimize data movement. Similarly when a new volume is created from a snapshot or from an existing volume, the same approach is taken. The same approach is also used when a new volume is created from a Glance image, if the source image is in raw format, and diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_images.xml b/doc/user-guide-admin/section_dashboard_admin_manage_images.xml index d1886b5f9c..d95f4d844e 100644 --- a/doc/user-guide-admin/section_dashboard_admin_manage_images.xml +++ b/doc/user-guide-admin/section_dashboard_admin_manage_images.xml @@ -140,7 +140,7 @@ In the Confirm Delete Image window, click Delete Images to confirm the - deletion. + deletion. You cannot undo this action. diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml b/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml index 5fe003c077..44ed3d3b7a 100644 --- a/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml +++ b/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml @@ -23,7 +23,7 @@ Guide. As an administrative user, you can manage volumes and volume types for users in various projects. You can create and delete - volumes types, and you can view and delete volumes. + volumes types, and you can view and delete volumes.
Create a volume type diff --git a/doc/user-guide-admin/section_nova_specify_host.xml b/doc/user-guide-admin/section_nova_specify_host.xml index ed31344219..66b5c9d262 100644 --- a/doc/user-guide-admin/section_nova_specify_host.xml +++ b/doc/user-guide-admin/section_nova_specify_host.xml @@ -16,7 +16,7 @@ within policy.json on the desired roles. By default, only the admin role has this setting enabled. You can view the list of valid compute hosts by using the nova - hypervisor-list command, for + hypervisor-list command, for example:$ nova hypervisor-list +----+---------------------+ | ID | Hypervisor hostname | diff --git a/doc/user-guide-admin/section_swift_cli_analyze_log_files.xml b/doc/user-guide-admin/section_swift_cli_analyze_log_files.xml index af7412e6f6..32d647aa12 100644 --- a/doc/user-guide-admin/section_swift_cli_analyze_log_files.xml +++ b/doc/user-guide-admin/section_swift_cli_analyze_log_files.xml @@ -5,8 +5,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="analyzing-log-files-with-swift-cli"> Analyze log files - Use the swift command-line client to analyze log files. - The swift client is simple to use, scalable, and flexible. Use the swift client or + Use the swift command-line client to analyze log files. + The swift client is simple to use, scalable, and flexible.Use the swift client or option to get short answers to questions about logs, You can use the option with a @@ -14,7 +14,7 @@ specific file or to STDOUT (-). The ability to redirect the output to STDOUT enables you to pipe (|) data without saving it to disk - first. + first.
Upload and analyze log files This example assumes that @@ -27,7 +27,7 @@ Each file uses the following line format: Log line formatNov 15 21:53:52 lucid64 proxy-server - 127.0.0.1 15/Nov/2010/22/53/52 DELETE /v1/AUTH_cd4f57824deb4248a533f2c28bf156d3/2eefc05599d44df38a7f18b0b42ffedd HTTP/1.0 204 - \ - test%3Atester%2CAUTH_tkcdab3c6296e249d7b7e2454ee57266ff - - - txaba5984c-aac7-460e-b04b-afc43f0c6571 - 0.0432 - + Change into the logtest directory: $ cd logtest @@ -53,23 +53,24 @@ Objects: 4 Bytes: 5864468 Read ACL: Write ACL: - List all objects in the logtest container: + List all objects in the logtest container: $ swift -A http:///swift-auth.com:11000/v1.0 -U test:tester -K testing list logtest 2010-11-15-21_access.log 2010-11-15-22_access.log 2010-11-16-21_access.log 2010-11-16-22_access.log
-
Download and analyze an object +
Download and analyze an object + This example uses the option and a hyphen (-) to get - information about an object. + information about an object. Use the swift download command to download the object. On this command, stream the output to awk to break down requests by return code and the date 2200 on - November 16th, 2010. + November 16th, 2010. Using the log line format, find the request type in - column 9 and the return code in column 12. + column 9 and the return code in column 12. After awk processes the output, it pipes it to sort and uniq -c to sum up the number of @@ -113,7 +114,7 @@ Write ACL: Use a bash for loop with awk and swift with the option and a hyphen (-) to discover how many - PUT requests are in each log file. + PUT requests are in each log file. Run the swift list command to list objects in the logtest container. Then, for @@ -135,14 +136,14 @@ Write ACL: Run the swift list -p 2010-11-15 command to list objects in the logtest container that begin with the 2010-11-15 - string. + string. For each item in the list, run the swift - download -o - command. + download -o - command. Pipe the output to grep and wc. Use the echo command to display the object name. - + $ for f in `swift -A http://swift-auth.com:11000/v1.0 -U test:tester -K testing list -p 2010-11-15 logtest` ; \ do echo -ne “$f - PUTS - ” ; swift -A http://127.0.0.1:11000/v1.0 -U test:tester \ -K testing download -o - logtest $f | grep PUT | wc -l ; \