diff --git a/doc/admin-guide-cloud/section_backup-block-storage-disks.xml b/doc/admin-guide-cloud/blockstorage/section_backup-block-storage-disks.xml similarity index 99% rename from doc/admin-guide-cloud/section_backup-block-storage-disks.xml rename to doc/admin-guide-cloud/blockstorage/section_backup-block-storage-disks.xml index 4afd217b36..19086ffc7e 100644 --- a/doc/admin-guide-cloud/section_backup-block-storage-disks.xml +++ b/doc/admin-guide-cloud/blockstorage/section_backup-block-storage-disks.xml @@ -1,6 +1,6 @@ + %openstack; ]>
+ %openstack; ]>
- diff --git a/doc/admin-guide-cloud/section_ts_failed_attach_vol_after_detach.xml b/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_after_detach.xml similarity index 95% rename from doc/admin-guide-cloud/section_ts_failed_attach_vol_after_detach.xml rename to doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_after_detach.xml index 8dddb9e367..025ebe39bb 100644 --- a/doc/admin-guide-cloud/section_ts_failed_attach_vol_after_detach.xml +++ b/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_after_detach.xml @@ -19,8 +19,8 @@ nova-attach command fails when you use the vdb, vdc, or vdd device names: - # ls -al /dev/disk/by-path/ -total 0 + # ls -al /dev/disk/by-path/ +total 0 drwxr-xr-x 2 root root 200 2012-08-29 17:33 . drwxr-xr-x 5 root root 100 2012-08-29 17:33 .. lrwxrwxrwx 1 root root 9 2012-08-29 17:33 pci-0000:00:04.0-virtio-pci-virtio0 -> ../../vda @@ -30,7 +30,7 @@ lrwxrwxrwx 1 root root 10 2012-08-29 17:33 pci-0000:00:04.0-virtio-pci-virtio0-p lrwxrwxrwx 1 root root 9 2012-08-29 17:33 pci-0000:00:06.0-virtio-pci-virtio2 -> ../../vdb lrwxrwxrwx 1 root root 9 2012-08-29 17:33 pci-0000:00:08.0-virtio-pci-virtio3 -> ../../vdc lrwxrwxrwx 1 root root 9 2012-08-29 17:33 pci-0000:00:09.0-virtio-pci-virtio4 -> ../../vdd -lrwxrwxrwx 1 root root 10 2012-08-29 17:33 pci-0000:00:09.0-virtio-pci-virtio4-part1 -> ../../vdd1 +lrwxrwxrwx 1 root root 10 2012-08-29 17:33 pci-0000:00:09.0-virtio-pci-virtio4-part1 -> ../../vdd1 You might also have this problem after attaching and detaching the same volume from the same VM with the same mount point multiple times. In this case, restart the KVM diff --git a/doc/admin-guide-cloud/section_ts_failed_attach_vol_no_sysfsutils.xml b/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_no_sysfsutils.xml similarity index 100% rename from doc/admin-guide-cloud/section_ts_failed_attach_vol_no_sysfsutils.xml rename to doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_no_sysfsutils.xml diff --git a/doc/admin-guide-cloud/section_ts_failed_connect_vol_FC_SAN.xml b/doc/admin-guide-cloud/blockstorage/section_ts_failed_connect_vol_FC_SAN.xml similarity index 100% rename from doc/admin-guide-cloud/section_ts_failed_connect_vol_FC_SAN.xml rename to doc/admin-guide-cloud/blockstorage/section_ts_failed_connect_vol_FC_SAN.xml diff --git a/doc/admin-guide-cloud/section_ts_multipath_warn.xml b/doc/admin-guide-cloud/blockstorage/section_ts_multipath_warn.xml similarity index 100% rename from doc/admin-guide-cloud/section_ts_multipath_warn.xml rename to doc/admin-guide-cloud/blockstorage/section_ts_multipath_warn.xml diff --git a/doc/admin-guide-cloud/section_ts_no_emulator_x86_64.xml b/doc/admin-guide-cloud/blockstorage/section_ts_no_emulator_x86_64.xml similarity index 100% rename from doc/admin-guide-cloud/section_ts_no_emulator_x86_64.xml rename to doc/admin-guide-cloud/blockstorage/section_ts_no_emulator_x86_64.xml diff --git a/doc/admin-guide-cloud/section_ts_non_existent_host.xml b/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_host.xml similarity index 99% rename from doc/admin-guide-cloud/section_ts_non_existent_host.xml rename to doc/admin-guide-cloud/blockstorage/section_ts_non_existent_host.xml index 119ffbc1b0..74f0afc6fe 100644 --- a/doc/admin-guide-cloud/section_ts_non_existent_host.xml +++ b/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_host.xml @@ -19,4 +19,3 @@ NON_EXISTENT_HOST - HOST '10' was not found to caller. storage server. - diff --git a/doc/admin-guide-cloud/section_ts_non_existent_vlun.xml b/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_vlun.xml similarity index 99% rename from doc/admin-guide-cloud/section_ts_non_existent_vlun.xml rename to doc/admin-guide-cloud/blockstorage/section_ts_non_existent_vlun.xml index dd09d1781a..4654cd2d57 100644 --- a/doc/admin-guide-cloud/section_ts_non_existent_vlun.xml +++ b/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_vlun.xml @@ -15,4 +15,3 @@ domain that the volume was created in. - diff --git a/doc/admin-guide-cloud/section_ts_vol_attach_miss_sg_scan.xml b/doc/admin-guide-cloud/blockstorage/section_ts_vol_attach_miss_sg_scan.xml similarity index 100% rename from doc/admin-guide-cloud/section_ts_vol_attach_miss_sg_scan.xml rename to doc/admin-guide-cloud/blockstorage/section_ts_vol_attach_miss_sg_scan.xml diff --git a/doc/admin-guide-cloud/section_volume-backups-export-import.xml b/doc/admin-guide-cloud/blockstorage/section_volume-backups-export-import.xml similarity index 100% rename from doc/admin-guide-cloud/section_volume-backups-export-import.xml rename to doc/admin-guide-cloud/blockstorage/section_volume-backups-export-import.xml diff --git a/doc/admin-guide-cloud/section_volume-backups.xml b/doc/admin-guide-cloud/blockstorage/section_volume-backups.xml similarity index 100% rename from doc/admin-guide-cloud/section_volume-backups.xml rename to doc/admin-guide-cloud/blockstorage/section_volume-backups.xml diff --git a/doc/admin-guide-cloud/section_volume-migration.xml b/doc/admin-guide-cloud/blockstorage/section_volume-migration.xml similarity index 100% rename from doc/admin-guide-cloud/section_volume-migration.xml rename to doc/admin-guide-cloud/blockstorage/section_volume-migration.xml diff --git a/doc/admin-guide-cloud/ch_blockstorage.xml b/doc/admin-guide-cloud/ch_blockstorage.xml index 070d9c4286..295b0ba662 100644 --- a/doc/admin-guide-cloud/ch_blockstorage.xml +++ b/doc/admin-guide-cloud/ch_blockstorage.xml @@ -99,12 +99,13 @@ and labels it as LVM. The network uses the FlatManager and NetworkManager settings for - OpenStack Compute (Nova). + OpenStack Compute. The network mode does not interfere with the way cinder works, but you must set up networking for cinder to work. For details, see . To set up Compute to use volumes, ensure that Block - Storage is installed along with lvm2. This guide describes + Storage is installed along with lvm2. This guide + describes how to troubleshoot your installation and back up your Compute volumes.
@@ -119,32 +120,32 @@ Guide.
- - - - - - - - + + + + + + + +
Troubleshoot your installation This section provides useful tips to help troubleshoot your Block Storage installation. - - - + + + - + href="blockstorage/section_ts_HTTP_bad_req_in_cinder_vol_log.xml"/> + + href="blockstorage/section_ts_failed_attach_vol_after_detach.xml"/> - - - - + href="blockstorage/section_ts_failed_attach_vol_no_sysfsutils.xml"/> + + + +
diff --git a/doc/admin-guide-cloud/ch_identity_mgmt.xml b/doc/admin-guide-cloud/ch_identity_mgmt.xml index 6e2006d2e1..5fd1bbf447 100644 --- a/doc/admin-guide-cloud/ch_identity_mgmt.xml +++ b/doc/admin-guide-cloud/ch_identity_mgmt.xml @@ -4,7 +4,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="ch-identity-mgmt-config"> Identity management - The OpenStack Identity Service, code-named Keystone, is the + The OpenStack Identity Service, code-named keystone, is the default identity management system for OpenStack. After you install the Identity Service, you configure it through the etc/keystone.conf configuration file and, diff --git a/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml b/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml index 1d2fc0cce1..ef97d577c0 100644 --- a/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml +++ b/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml @@ -42,8 +42,8 @@ - OpenStack Controller host - controlnode - Runs the Neutron, Keystone, and Nova + OpenStack controller host - controlnode + Runs the Networking, Identity, and Compute services that are required to deploy VMs. The node must have at least one network interface that is connected to the @@ -56,8 +56,9 @@ HostA - Runs Nova compute, the Neutron L2 agent and - DHCP agent + Runs nova-compute, the + Neutron L2 agent and DHCP agent HostB @@ -69,7 +70,7 @@
Configuration - controlnode: Neutron Server + controlnode: neutron server Neutron configuration file /etc/neutron/neutron.conf: @@ -94,7 +95,7 @@ physical_interface_mappings = physnet1:eth0 - HostA and HostB: L2 Agent + HostA and Hostb: L2 agent Neutron configuration file /etc/neutron/neutron.conf: @@ -132,7 +133,7 @@ firewall_driver=nova.virt.firewall.NoopFirewallDriver - HostA and HostB: DHCP Agent + HostA and HostB: DHCP agent Update the DHCP configuration file /etc/neutron/dhcp_agent.ini: @@ -149,7 +150,7 @@ interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver Ensure that the following environment variables are set. These are used by the various clients to access - Keystone. + the Identity Service. export OS_USERNAME=admin export OS_PASSWORD=adminpassword export OS_TENANT_NAME=admin diff --git a/doc/admin-guide-cloud/networking/section_networking_adv_features.xml b/doc/admin-guide-cloud/networking/section_networking_adv_features.xml index 99ac52a1ad..e9ef45dd39 100644 --- a/doc/admin-guide-cloud/networking/section_networking_adv_features.xml +++ b/doc/admin-guide-cloud/networking/section_networking_adv_features.xml @@ -1155,7 +1155,7 @@ Then, when ports are created on that network they are automatically created and associated with the specific queue size that was associated with the network. Because one size queue for a every port on a network might not be optimal, a - scaling factor from the Nova flavor 'rxtx_factor' is passed in from Compute when + scaling factor from the nova flavor 'rxtx_factor' is passed in from Compute when creating the port to scale the queue. Lastly, if you want to set a specific baseline QoS policy for the amount of bandwidth a single port can use (unless a network queue is specified with the @@ -1467,7 +1467,7 @@
Big Switch plug-in extensions - This section explains the Big Switch Neutron plug-in-specific extension. + This section explains the Big Switch neutron plug-in-specific extension.
Big Switch router rules Big Switch allows router rules to be added to each tenant router. These rules @@ -1480,7 +1480,7 @@ Each tenant router has a set of router rules associated with it. Each router rule has the attributes in this table. Router rules and their attributes can be set using the neutron router-update - command, through the Horizon interface or the Neutron API. + command, through the horizon interface or the Networking API. diff --git a/doc/admin-guide-cloud/networking/section_networking_arch.xml b/doc/admin-guide-cloud/networking/section_networking_arch.xml index 3bcb147e79..028914252d 100644 --- a/doc/admin-guide-cloud/networking/section_networking_arch.xml +++ b/doc/admin-guide-cloud/networking/section_networking_arch.xml @@ -75,11 +75,11 @@ Networking relies on the Identity service - (Keystone) for the authentication and + (keystone) for the authentication and authorization of all API requests. - Compute (Nova) interacts with Networking + Compute (nova) interacts with Networking through calls to its standard API. As part of creating a VM, the nova-compute service @@ -88,7 +88,7 @@ network. - The Dashboard (Horizon) integrates with the + The dashboard (horizon) integrates with the Networking API, enabling administrators and tenant users to create and manage network services through a web-based GUI. diff --git a/doc/admin-guide-cloud/networking/section_networking_introduction.xml b/doc/admin-guide-cloud/networking/section_networking_introduction.xml index 71c13138ab..7cdf5bd55a 100644 --- a/doc/admin-guide-cloud/networking/section_networking_introduction.xml +++ b/doc/admin-guide-cloud/networking/section_networking_introduction.xml @@ -4,7 +4,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> Introduction to Networking - The Networking service, code-named Neutron, provides an API + The Networking service, code-named neutron, provides an API that lets you define network connectivity and addressing in the cloud. The Networking service enables operators to leverage different networking technologies to power their @@ -1479,8 +1479,8 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriverInstall the agent by running: # apt-get install neutron-metering-agent Package name prior to Icehouse - In releases of Neutron prior to Icehouse, this - package was named neutron-plugin-metering-agent. + In releases of neutron prior to Icehouse, this + package was named neutron-plugin-metering-agent.
Big Switch Router rule attributes