From 8df08851d78550bace7ebc56d4b5fe52ae147785 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 18 Mar 2014 18:52:11 +0100 Subject: [PATCH] Edits for TB/GB/MB/KB usage Improve some wording and introduce non-breaking spaces. Change-Id: I315968c155f6707b4ae57b00cf96a26b453e1d23 Co-Authored-By: Diane Fleming --- doc/admin-guide-cloud/ch_blockstorage.xml | 6 +++- doc/admin-guide-cloud/ch_compute.xml | 6 +++- .../section_backup-block-storage-disks.xml | 12 ++++--- .../section_ts_cinder_config.xml | 6 +++- .../section_cli_cinder_manage_volumes.xml | 5 ++- .../section_cli_nova_boot_from_volume.xml | 6 +++- .../section_cli_nova_host_aggregates.xml | 6 +++- doc/common/section_objectstorage-arch.xml | 11 ++++-- doc/common/section_storage-concepts.xml | 8 +++-- .../compute/section_compute-scheduler.xml | 13 ++++--- .../compute/section_hypervisor_vmware.xml | 17 +++++---- doc/glossary/glossary-terms.xml | 7 ++-- .../ch_creating_images_manually.xml | 36 +++++++++++-------- doc/image-guide/ch_modifying_images.xml | 8 +++-- ...ection_object-storage-sys-requirements.xml | 12 ++++--- .../section_ceilometer-install.xml | 17 +++++---- .../lab000-virtualbox-basics.xml | 22 +++++++----- .../module003-ch006-more-concepts.xml | 14 +++++--- ...le003-ch007-swift-cluster-architecture.xml | 16 +++++---- .../section_cli_keystone_set_quotas.xml | 7 ++-- .../section_dashboard_admin_set_quotas.xml | 7 ++-- .../section_cli_nova_config-drive.xml | 8 +++-- 22 files changed, 169 insertions(+), 81 deletions(-) diff --git a/doc/admin-guide-cloud/ch_blockstorage.xml b/doc/admin-guide-cloud/ch_blockstorage.xml index 92056efda4..9822c6e5b9 100644 --- a/doc/admin-guide-cloud/ch_blockstorage.xml +++ b/doc/admin-guide-cloud/ch_blockstorage.xml @@ -1,4 +1,8 @@ + + +]> cinder-* services. Two additional compute nodes run nova-compute. The walk through uses a - custom partitioning scheme that carves out 60 GB of space + custom partitioning scheme that carves out 60 GB of space and labels it as LVM. The network uses the FlatManager and NetworkManager settings for diff --git a/doc/admin-guide-cloud/ch_compute.xml b/doc/admin-guide-cloud/ch_compute.xml index 7768f25631..1059c6676e 100644 --- a/doc/admin-guide-cloud/ch_compute.xml +++ b/doc/admin-guide-cloud/ch_compute.xml @@ -1,4 +1,8 @@ + + +]> In addition to the ephemeral root volume, all flavors except the smallest, m1.tiny, also provide an additional ephemeral block device of between 20 - and 160GB. These sizes can be configured to suit your + and 160 GB. These sizes can be configured to suit your environment. This is presented as a raw block device with no partition table or file system. Cloud-aware operating system images can discover, format, and mount these diff --git a/doc/admin-guide-cloud/section_backup-block-storage-disks.xml b/doc/admin-guide-cloud/section_backup-block-storage-disks.xml index dcd18f6808..bff73cc3f9 100644 --- a/doc/admin-guide-cloud/section_backup-block-storage-disks.xml +++ b/doc/admin-guide-cloud/section_backup-block-storage-disks.xml @@ -1,4 +1,8 @@ + + +]>
- For this example, assume that a 100 GB volume named + For this example, assume that a 100 GB volume named volume-00000001 was created for an - instance while only 4 GB are used. This example uses these - commands to back up only those 4 GB: + instance while only 4 GB are used. This example uses these + commands to back up only those 4 GB: lvm2 command. Directly @@ -204,7 +208,7 @@ Block device 251:14 carefully because the time it takes to complete the calculation is directly proportional to the size of the file. - For files larger than around 4 to 6 GB, and + For files larger than around 4 to 6 GB, and depending on your CPU, the process might take a long time. diff --git a/doc/admin-guide-cloud/section_ts_cinder_config.xml b/doc/admin-guide-cloud/section_ts_cinder_config.xml index 63869929c3..8a69d579fd 100644 --- a/doc/admin-guide-cloud/section_ts_cinder_config.xml +++ b/doc/admin-guide-cloud/section_ts_cinder_config.xml @@ -1,4 +1,8 @@ + + +]>
2013-03-12 01:35:43 1248 TRACE cinder.openstack.common.rpc.amqp ISCSITargetCreateFailed: Failed to create iscsi target for volume volume-137641b2-af72-4a2f-b243-65fdccd38780. You might see this error in cinder-volume.log after - trying to create a volume that is 1 GB. To fix this + trying to create a volume that is 1 GB. To fix this issue: Change content of the /etc/tgt/targets.conf from diff --git a/doc/common/section_cli_cinder_manage_volumes.xml b/doc/common/section_cli_cinder_manage_volumes.xml index 1b06070e5c..22d439a9de 100644 --- a/doc/common/section_cli_cinder_manage_volumes.xml +++ b/doc/common/section_cli_cinder_manage_volumes.xml @@ -1,4 +1,7 @@ + +]>
- Create a volume with 8 GBs of space. Specify the + Create a volume with 8 GB of space. Specify the availability zone and image: $ cinder create 8 --display-name my-new-volume --image-id 397e713c-b95b-4186-ad46-6126863ea0a9 --availability-zone nova +---------------------+--------------------------------------+ diff --git a/doc/common/section_cli_nova_boot_from_volume.xml b/doc/common/section_cli_nova_boot_from_volume.xml index 8b2a2e08cf..bba6c7b072 100644 --- a/doc/common/section_cli_nova_boot_from_volume.xml +++ b/doc/common/section_cli_nova_boot_from_volume.xml @@ -1,4 +1,8 @@ + + +]>
--ephemeral parameter to attach an ephemeral disk on boot. When you terminate the instance, both disks are deleted. - Boot an instance with a 512 MB swap disk and 2 GB ephemeral + Boot an instance with a 512 MB swap disk and 2 GB ephemeral disk: $ nova boot --flavor FLAVOR --image IMAGE_ID --swap 512 --ephemeral size=2 NAME diff --git a/doc/common/section_cli_nova_host_aggregates.xml b/doc/common/section_cli_nova_host_aggregates.xml index d5595d5432..c6302a7279 100644 --- a/doc/common/section_cli_nova_host_aggregates.xml +++ b/doc/common/section_cli_nova_host_aggregates.xml @@ -1,4 +1,8 @@ + + +]>
Use the nova flavor-create command to create the ssd.large flavor called with - an ID of 6, 8GB of RAM, 80GB root disk, and 4 + an ID of 6, 8 GB of RAM, 80 GB root disk, and 4 vCPUs. $ nova flavor-create ssd.large 6 8192 80 4 +----+-----------+-----------+------+-----------+------+-------+-------------+-----------+-------------+ diff --git a/doc/common/section_objectstorage-arch.xml b/doc/common/section_objectstorage-arch.xml index aab98cf9b2..d17bf414ab 100644 --- a/doc/common/section_objectstorage-arch.xml +++ b/doc/common/section_objectstorage-arch.xml @@ -1,4 +1,8 @@ + + +]>
- Currently, 2 TB or 3 TB SATA disks deliver good price/performance value. You can use - desktop-grade drives if you have responsive remote hands in the datacenter and - enterprise-grade drives if you don't. + Currently, a 2 TB or 3 TB SATA disk delivers + good performance for the price. You can use desktop-grade + drives if you have responsive remote hands in the datacenter + and enterprise-grade drives if you don't.
Factors to consider You should keep in mind the desired I/O performance for single-threaded requests . diff --git a/doc/common/section_storage-concepts.xml b/doc/common/section_storage-concepts.xml index dc4ac21a71..007b19a368 100644 --- a/doc/common/section_storage-concepts.xml +++ b/doc/common/section_storage-concepts.xml @@ -1,4 +1,8 @@ + + +]>
Easily scalable for future growth - Example: 10 GB first disk, 30 GB/core second disk - Example: 1 TB "extra hard drive" + Example: 10 GB first disk, 30 GB/core second disk + Example: 1 TB "extra hard drive" Example: 10s of TBs of data set storage diff --git a/doc/config-reference/compute/section_compute-scheduler.xml b/doc/config-reference/compute/section_compute-scheduler.xml index 85d1bfa967..e60f0b8569 100644 --- a/doc/config-reference/compute/section_compute-scheduler.xml +++ b/doc/config-reference/compute/section_compute-scheduler.xml @@ -1,3 +1,8 @@ + + + +]>
nova.conf. The default setting is: - ram_allocation_ratio=1.5 - With this setting, if there is 1 GB of free RAM, the - scheduler allows instances up to size 1.5 GB to be run - on that instance. + ram_allocation_ratio=1.5 + This setting enables 1.5 GB instances to run on + any compute node with 1 GB of free RAM.
RetryFilter diff --git a/doc/config-reference/compute/section_hypervisor_vmware.xml b/doc/config-reference/compute/section_hypervisor_vmware.xml index fd05499ebb..c85ee2c4b0 100644 --- a/doc/config-reference/compute/section_hypervisor_vmware.xml +++ b/doc/config-reference/compute/section_hypervisor_vmware.xml @@ -1,4 +1,8 @@ + + +]>
Copying VMDK files (vSphere 5.1 only). In vSphere 5.1, copying large image files - (for example, 12 GB and greater) from Glance can take a long + (for example, 12 GB and greater) from Glance can take a long time. To improve performance, VMware recommends that you upgrade to VMware vCenter Server 5.1 Update 1 or later. For more information, see the Release Notes. @@ -231,11 +235,12 @@ datastore_regex=<optional datastore regex> data stores that are not intended for OpenStack. - Reserved host memory: - The setting is set - to 512 MB by default. However, VMware recommends setting - this value to 0 MB because the vCenter driver reports - the effective memory available to the virtual machines. + Reserved host memory: The + option value is + 512 MB by default. However, VMware recommends that + you set this option to 0 MB because the vCenter + driver reports the effective memory available to the + virtual machines. diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml index afadaaa99d..7ba2e2f71a 100644 --- a/doc/glossary/glossary-terms.xml +++ b/doc/glossary/glossary-terms.xml @@ -2,6 +2,7 @@ + ]> large object - An object within Object Storage that is larger than 5 - GBs. + + An object within Object Storage that is larger than + 5 GB. + diff --git a/doc/image-guide/ch_creating_images_manually.xml b/doc/image-guide/ch_creating_images_manually.xml index 72a0569fdd..f20c2c0924 100644 --- a/doc/image-guide/ch_creating_images_manually.xml +++ b/doc/image-guide/ch_creating_images_manually.xml @@ -1,4 +1,8 @@ + + +]> - This uses the KVM hypervisor to start up a virtual - machine with the libvirt name of - centos-6.4 with 1024MB of RAM, with - a virtual CD-ROM drive associated with the - /data/CentOS-6.4-x86_64-netinstall.iso - file, and a local hard disk which is stored in the host at - /data/centos-6.4.qcow2 that is - 10GB in size in qcow2 format. It configures networking to + + The KVM hypervisor starts the virtual machine with the + libvirt name, centos-6.4, with + 1024 MB of RAM. The virtual machine also has a virtual + CD-ROM drive associated with the + /data/CentOS-6.4-x86_64-netinstall.iso + file and a local 10 GB hard disk in qcow2 format that is + stored in the host at + /data/centos-6.4.qcow2. + It configures networking to use libvirt's default network. There is a VNC server that is listening on all interfaces, and libvirt will not attempt to launch a VNC client automatically nor try to @@ -146,13 +152,13 @@ the console to complete the installation process. libvirt will attempt to optimize the configuration for a Linux guest running a RHEL 6.x distribution. When using the libvirt - default network, libvirt - will connect the virtual machine's interface to a - bridge called virbr0. There is - a dnsmasq process managed by libvirt that will - hand out an IP address on the 192.168.122.0/24 - subnet, and libvirt has iptables rules for doing - NAT for IP addresses on this subnet. + default network, libvirt will + connect the virtual machine's interface to a bridge + called virbr0. There is a dnsmasq + process managed by libvirt that will hand out an IP + address on the 192.168.122.0/24 subnet, and libvirt + has iptables rules for doing NAT for IP addresses on + this subnet. Run the virt-install --os-variant list command to see a range of allowed diff --git a/doc/image-guide/ch_modifying_images.xml b/doc/image-guide/ch_modifying_images.xml index 36dca1e8fb..8ee10a80fe 100644 --- a/doc/image-guide/ch_modifying_images.xml +++ b/doc/image-guide/ch_modifying_images.xml @@ -1,4 +1,8 @@ + + +]> Resize an image Here's a simple of example of how to use virt-resize to resize an image. - Assume we have a 16GB Windows image in qcow2 format - that we want to resize to 50GB. First, we use + Assume we have a 16 GB Windows image in qcow2 format + that we want to resize to 50 GB. First, we use virt-filesystems to identify the partitions:# virt-filesystems --long --parts --blkdevs -h -a /data/images/win2012.qcow2 diff --git a/doc/install-guide/object-storage/section_object-storage-sys-requirements.xml b/doc/install-guide/object-storage/section_object-storage-sys-requirements.xml index e239dc0f59..1995e44bc4 100644 --- a/doc/install-guide/object-storage/section_object-storage-sys-requirements.xml +++ b/doc/install-guide/object-storage/section_object-storage-sys-requirements.xml @@ -1,4 +1,8 @@ + + +]>
Object Storage object servers Processor: dual quad - coreMemory: 8 or 12 GB RAM + coreMemory: 8 or 12 GB RAM Disk space: optimized for cost per GB - Network: one 1 GB Network Interface Card + Network: one 1 GB Network Interface Card (NIC) The amount of disk space depends on how much you can fit into the rack efficiently. You @@ -59,8 +63,8 @@ servers Processor: dual quad core - Memory: 8 or 12 GB RAM - Network: one 1 GB Network Interface Card + Memory: 8 or 12 GB RAM + Network: one 1 GB Network Interface Card (NIC) Optimized for IOPS due to tracking with SQLite databases. diff --git a/doc/install-guide/section_ceilometer-install.xml b/doc/install-guide/section_ceilometer-install.xml index c0e0024d9f..1f8165fef8 100644 --- a/doc/install-guide/section_ceilometer-install.xml +++ b/doc/install-guide/section_ceilometer-install.xml @@ -1,4 +1,8 @@ + + +]>
# apt-get install mongodb - By default MongoDB is configured to create several 1 GB files + By default MongoDB is configured to create several 1 GB files in the /var/lib/mongodb/journal/ directory to support database journaling. - If you need to minimize the space allocated to support database - journaling then set the configuration - key to true in the /etc/mongodb.conf - configuration file. This will reduce the size of each journaling file - to 512 MB. + If you need to minimize the space allocated to support + database journaling then set the + configuration key to true in the + /etc/mongodb.conf configuration + file. This configuration reduces the size of each journaling + file to 512 MB. As the files are created the first time the MongoDB service starts diff --git a/doc/training-guides/lab000-virtualbox-basics.xml b/doc/training-guides/lab000-virtualbox-basics.xml index 3dfab31a9d..28da8bc7ce 100644 --- a/doc/training-guides/lab000-virtualbox-basics.xml +++ b/doc/training-guides/lab000-virtualbox-basics.xml @@ -1,4 +1,8 @@ + + +]> VT Enabled PC: - Intel ix or Amd QuadCore + Intel ix or AMD QuadCore - 4GB Ram: + 4 GB RAM: DDR2/DDR3 @@ -372,9 +376,9 @@ - Select appropriate RAM, minimum 512 MB of RAM for Control - Node. Rest all can be default settings. The hard disk size can - be 8GB as default. + Select the appropriate amount of RAM. For the control node, + the minimum is 512 MB of RAM. For other settings, use the + defaults. The hard disk size can be 8 GB as default. Configure the networks (Ignore the IP Address for now, you will set it up from inside the VM) @@ -439,8 +443,8 @@ are doing. Network Node: Create a new Virtual Machine, - Minimum RAM is 512MB. Rest all can be left default. Minimum - HDD space 8GB. + Minimum RAM is 512 MB. Rest all can be left default. Minimum + HDD space 8 GB.
Create New Virtual Machine @@ -526,8 +530,8 @@ like DNS servers etc. (not necessary). Unless you know what you are doing. Compute Node: - Create a new virtual machine, give it atleast 1,000 MB RAM. - Rest all can be left as defaults. Give atleast 8GB HDD. + Create a virtual machine with at least 1,000 MB RAM and + 8 GB HDD. For other settings, use the defaults.
Create New Virtual Machine diff --git a/doc/training-guides/module003-ch006-more-concepts.xml b/doc/training-guides/module003-ch006-more-concepts.xml index 6c5d5b907b..d3ded816b7 100644 --- a/doc/training-guides/module003-ch006-more-concepts.xml +++ b/doc/training-guides/module003-ch006-more-concepts.xml @@ -1,4 +1,8 @@ + + +]> The maximum allowable size for a storage object upon - upload is 5 gigabytes (GB) and the minimum is zero bytes. + upload is 5 GB and the minimum is zero bytes. You can use the built-in large object support and the - swift utility to retrieve objects larger than 5 GB. + swift utility to retrieve objects larger than 5 GB. For metadata, you should not exceed 90 individual key/value pairs for any one object and the total byte - length of all key/value pairs should not exceed 4KB (4096 - bytes). + length of all key/value pairs should not exceed 4 KB + (4096 bytes). Language-Specific API Bindings A set of supported API bindings in several popular @@ -217,4 +221,4 @@ other errors are found they are logged. For example, an object’s listing cannot be found on any container server it should be. - \ No newline at end of file + diff --git a/doc/training-guides/module003-ch007-swift-cluster-architecture.xml b/doc/training-guides/module003-ch007-swift-cluster-architecture.xml index 43f2bfb7f7..1da218db6b 100644 --- a/doc/training-guides/module003-ch007-swift-cluster-architecture.xml +++ b/doc/training-guides/module003-ch007-swift-cluster-architecture.xml @@ -1,4 +1,8 @@ + + +]> - Currently 2 TB or 3 TB SATA disks deliver good - price/performance value. Desktop-grade drives can be used - where there are responsive remote hands in the datacenter, - and enterprise-grade drives can be used where this is not - the case. - Factors to Consider + Currently, a 2 TB or 3 TB SATA disk delivers + good performance for the price. Desktop-grade drives can + be used where there are responsive remote hands in the + datacenter, and enterprise-grade drives can be used where + this is not the case. + Factors to Consider Desired I/O performance for single-threaded requests should be kept in mind. This system does not use RAID, so each request for an object is handled by a single diff --git a/doc/user-guide-admin/section_cli_keystone_set_quotas.xml b/doc/user-guide-admin/section_cli_keystone_set_quotas.xml index 3d5d9f055b..63b2fa443c 100644 --- a/doc/user-guide-admin/section_cli_keystone_set_quotas.xml +++ b/doc/user-guide-admin/section_cli_keystone_set_quotas.xml @@ -5,6 +5,7 @@ + ]>
Using the command-line interface, you can manage quotas for the OpenStack Compute service, the OpenStack Block Storage service, and the OpenStack Networking service. - Typically, default values are changed because a tenant - requires more than 10 volumes, or more than 1 TB on a compute node. + The cloud operator typically changes default values because a + tenant requires more than ten volumes or 1 TB on a compute + node. + To view all tenants (projects), run: $ keystone tenant-list diff --git a/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml b/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml index e51695ebd8..0bec65f6c5 100644 --- a/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml +++ b/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml @@ -1,10 +1,11 @@ + + ]>
- Typically, you change quotas when a project needs more than 10 - volumes or 1 TB on a compute node. + Typically, you change quotas when a project needs more than ten + volumes or 1 TB on a compute node. Using the Dashboard, you can view default Compute and Block Storage quotas for new tenants, as well as update quotas for existing tenants. diff --git a/doc/user-guide/section_cli_nova_config-drive.xml b/doc/user-guide/section_cli_nova_config-drive.xml index 401cb8b440..89d1c21e7b 100644 --- a/doc/user-guide/section_cli_nova_config-drive.xml +++ b/doc/user-guide/section_cli_nova_config-drive.xml @@ -1,4 +1,8 @@ + + +]>
/etc/nova/nova.conf file: config_drive_format=vfat - If you choose VFAT, the configuration drive is 64 - MBs. + If you choose VFAT, the configuration drive is + 64 MB.