diff --git a/doc/admin-guide-cloud/ch_compute.xml b/doc/admin-guide-cloud/ch_compute.xml
index 0a83332d48..8789ec0303 100644
--- a/doc/admin-guide-cloud/ch_compute.xml
+++ b/doc/admin-guide-cloud/ch_compute.xml
@@ -1002,7 +1002,7 @@ header: Date: Thu, 13 Sep 2012 20:27:36 GMT
avoid raising an error. Compute nodes have
iptables/ebtables entries created for each project and instance
to protect against IP/MAC address spoofing and ARP
- poisoning.
+ poisoning.
In single-host Flat DHCP mode you will be able to ping VMs
@@ -2124,7 +2124,7 @@ HostC p2 5 10240 150
live-migration,
under the default Compute
configuration options the instances
- are suspended before migration.
+ are suspended before migration.
See Configure migrations in OpenStack Configuration Reference for more details.
@@ -2137,7 +2137,7 @@ HostC p2 5 10240 150
from a failed compute node. Of the two methods covered in the following sections,
the evacuate API is the preferred method even in the absence of shared storage. The
evacuate API provides many benefits over manual recovery, such as re-attachment of
- volumes and floating IPs.
+ volumes and floating IPs.
Manual recovery
diff --git a/doc/admin-guide-cloud/section_troubleshoot-cinder.xml b/doc/admin-guide-cloud/section_troubleshoot-cinder.xml
index ea3d8f5395..198805d5dd 100644
--- a/doc/admin-guide-cloud/section_troubleshoot-cinder.xml
+++ b/doc/admin-guide-cloud/section_troubleshoot-cinder.xml
@@ -61,7 +61,7 @@
This is most likely going to be a minor adjustment to your
nova.conf file. Make sure that your
nova.conf has the following
- entry:volume_api_class=nova.volume.cinder.API
+ entry:volume_api_class=nova.volume.cinder.APIMake certain that you explicitly set
because the default includes
:enabled_apis=ec2,osapi_compute,metadata
@@ -70,7 +70,7 @@
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.
+ create a volume that is 1 GB.
To fix this issue, change the content of the
/etc/tgt/targets.conf from
include /etc/tgt/conf.d/*.conf to
diff --git a/doc/common/section_baremetal.xml b/doc/common/section_baremetal.xml
index 80ece24ed9..2b0a362586 100644
--- a/doc/common/section_baremetal.xml
+++ b/doc/common/section_baremetal.xml
@@ -14,7 +14,7 @@ xml:id="baremetal">
hardware via OpenStack's API, using pluggable sub-drivers to deliver
machine imaging (PXE) and power control (IPMI). With this, provisioning
and management of physical hardware is accomplished using common cloud
- APIs and tools, such as OpenStack Orchestration or salt-cloud.
+ APIs and tools, such as OpenStack Orchestration 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
diff --git a/doc/common/section_config_keystone_ldap.xml b/doc/common/section_config_keystone_ldap.xml
index db0d65766a..cb8433768c 100644
--- a/doc/common/section_config_keystone_ldap.xml
+++ b/doc/common/section_config_keystone_ldap.xml
@@ -5,9 +5,9 @@
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
xml:id="configuring-keystone-for-ldap-backend">
Configuring OpenStack Identity for an LDAP backend
- As an alternative to the SQL Database backing store, Identity can use
+ As an alternative to the SQL Database backing store, Identity can use
a directory server to provide the Identity service. An example schema
- for AcmeExample would look like this:
+ for AcmeExample would look like this:
dn: dc=AcmeExample,dc=org
dc: AcmeExample
@@ -30,7 +30,7 @@ objectClass: top
objectClass: organizationalUnit
ou: roles
- The corresponding entries in the keystone.conf
+ The corresponding entries in the keystone.conf
configuration file are:
[ldap]
@@ -60,7 +60,7 @@ role_objectclass = organizationalRole
uidNumber and username
field either uid or cn. To
change these two fields, the corresponding entries in the Keystone
- configuration file are:
+ configuration file are:
[ldap]
user_id_attribute = uidNumber
@@ -69,7 +69,7 @@ user_name_attribute = cn
There is a set of allowed actions per object type that you can modify
depending on your specific deployment. For example, the users are
managed by another tool and you have only read access, in such case the
- configuration is:
+ configuration is:
[ldap]
user_allow_create = False
@@ -86,7 +86,7 @@ role_allow_delete = True
There are some configuration options for filtering users, tenants and
roles, if the backend is providing too much output, in such case the
- configuration will look like:
+ configuration will look like:
[ldap]
user_filter = (memberof=CN=acme-users,OU=workgroups,DC=AcmeExample,DC=com)
diff --git a/doc/common/section_dashboard-configure-https.xml b/doc/common/section_dashboard-configure-https.xml
index 8e59546c8a..3246085cfe 100644
--- a/doc/common/section_dashboard-configure-https.xml
+++ b/doc/common/section_dashboard-configure-https.xml
@@ -1,7 +1,7 @@
Configure the dashboard for HTTPS
+ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">Configure the dashboard for HTTPSYou can configure the dashboard for a secured HTTPS deployment. While the standard installation
uses a non-encrypted HTTP channel, you can enable SSL support
for the dashboard.
@@ -29,7 +29,7 @@ SESSION_COOKIE_HTTPONLY = TrueEdit
/etc/apache2/conf.d/openstack-dashboard.conf:
-
+
Before:WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
WSGIDaemonProcess horizon user=www-data group=www-data processes=3 threads=10
@@ -38,7 +38,7 @@ Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/
Order allow,deny
Allow from all
</Directory>
-
+
After:<VirtualHost *:80>
ServerName openstack.example.com
diff --git a/doc/common/section_dashboard-configure-vnc-window.xml b/doc/common/section_dashboard-configure-vnc-window.xml
index fa49cbd4c3..7555f4ba45 100644
--- a/doc/common/section_dashboard-configure-vnc-window.xml
+++ b/doc/common/section_dashboard-configure-vnc-window.xml
@@ -7,7 +7,7 @@
The _detail_vnc.html file defines
the size of the VNC window. To change the window size, edit
this file.
-
+ Edit
/usr/share/pyshared/horizon/dashboards/nova/instances/templates/instances/_detail_vnc.html.
diff --git a/doc/common/section_dashboard-configure.xml b/doc/common/section_dashboard-configure.xml
index 6e86fcaa9a..16714c5d17 100644
--- a/doc/common/section_dashboard-configure.xml
+++ b/doc/common/section_dashboard-configure.xml
@@ -6,13 +6,13 @@
Configure the dashboardYou can configure the dashboard for a simple HTTP
- deployment.
+ deployment.
You can configure the dashboard for a secured HTTPS
deployment. While the standard installation uses a
non-encrypted HTTP channel, you can enable SSL support for the
dashboard.Also, you can configure the size of the VNC window in the
- dashboard.
+ dashboard.
diff --git a/doc/common/section_networking-quotas.xml b/doc/common/section_networking-quotas.xml
index 497c8c13be..86517456ad 100644
--- a/doc/common/section_networking-quotas.xml
+++ b/doc/common/section_networking-quotas.xml
@@ -10,7 +10,7 @@
$neutron net-create test_netQuota exceeded for resources: ['network']Per-tenant quota configuration is also supported by the quota extension API. See Per-tenant quota configuration for details.
+ linkend="cfg_quotas_per_tenant"> Per-tenant quota configuration for details.
Basic quota configurationIn the Networking default quota mechanism, all tenants have the same quota value, such
diff --git a/doc/common/section_nova_cli_commands.xml b/doc/common/section_nova_cli_commands.xml
index a27c099927..7f67cdb2f2 100644
--- a/doc/common/section_nova_cli_commands.xml
+++ b/doc/common/section_nova_cli_commands.xml
@@ -212,7 +212,7 @@
x509-create-cert Create x509 cert for a user in tenant.
x509-get-root-cert Fetches the x509 root cert.
bash-completion Prints out a list of all possible commands and flags
- that the nova command can accept. Can be used by bash
+ that the nova command can accept. Can be used by bash
for tab-completion of commands.
help Display help about this program or one of its
subcommands.
diff --git a/doc/common/section_nova_cli_quotas.xml b/doc/common/section_nova_cli_quotas.xml
index 507ee368ca..b7e3c78417 100644
--- a/doc/common/section_nova_cli_quotas.xml
+++ b/doc/common/section_nova_cli_quotas.xml
@@ -110,7 +110,7 @@
instances
-
+
Number of instances allowed per tenant.
@@ -356,4 +356,4 @@
-
\ No newline at end of file
+
diff --git a/doc/config-reference/block-storage/drivers/ibm-gpfs-volume-driver.xml b/doc/config-reference/block-storage/drivers/ibm-gpfs-volume-driver.xml
index 9ef7e361cd..0f12df3a0e 100644
--- a/doc/config-reference/block-storage/drivers/ibm-gpfs-volume-driver.xml
+++ b/doc/config-reference/block-storage/drivers/ibm-gpfs-volume-driver.xml
@@ -59,7 +59,7 @@
gpfs_mount_point_base and
gpfs_images_dir flags must both
reside in the same GPFS file system and in the same
- GPFS file set.
+ GPFS file set.
diff --git a/doc/config-reference/networking/section_networking-config-identity.xml b/doc/config-reference/networking/section_networking-config-identity.xml
index d3222b9e98..305b9eb5d0 100644
--- a/doc/config-reference/networking/section_networking-config-identity.xml
+++ b/doc/config-reference/networking/section_networking-config-identity.xml
@@ -15,13 +15,13 @@
Add the following function to your
- .bashrc file:
+ .bashrc file:
$function get_id () {
echo `"$@" | awk '/ id / { print $4 }'`
}
- Source the .bashrc file:
+ Source the .bashrc file:$source .bashrc
@@ -29,7 +29,7 @@ echo `"$@" | awk '/ id / { print $4 }'`
Create the OpenStack Networking Service EntryOpenStack Networking must be available in the OpenStack
- Compute service catalog. Create the service, as follows:
+ Compute service catalog. Create the service, as follows:
$NEUTRON_SERVICE_ID=$(get_id keystone service-create --name neutron --type network --description 'OpenStack Networking Service')
@@ -37,7 +37,7 @@ echo `"$@" | awk '/ id / { print $4 }'`
Entry
The way that you create an OpenStack Networking endpoint
entry depends on whether you are using the SQL catalog driver
- or the template catalog driver:
+ or the template catalog driver:
@@ -58,7 +58,7 @@ echo `"$@" | awk '/ id / { print $4 }'`
OpenStack Compute catalog template file
(default_catalog.templates), using these parameters:
given region ($REGION) and IP address of the OpenStack
- Networking server ($IP).
+ Networking server ($IP).
catalog.$REGION.network.publicURL = http://$IP:9696
catalog.$REGION.network.adminURL = http://$IP:9696
catalog.$REGION.network.internalURL = http://$IP:9696
@@ -80,32 +80,32 @@ catalog.$Region.network.internalURL = http://10.211.55.17:9696
approach is to create a special service
tenant, create a neutron user within this
tenant, and to assign this user an admin
- role.
+ role.
- Create the admin role:
+ Create the admin role:$ADMIN_ROLE=$(get_id keystone role-create --name=admin)
- Create the neutron user:
+ Create the neutron user:$NEUTRON_USER=$(get_id keystone user-create --name=neutron --pass="$NEUTRON_PASSWORD" --email=demo@example.com --tenant-id service)
- Create the service tenant:
+ Create the service tenant:$SERVICE_TENANT=$(get_id keystone tenant-create --name service --description "Services Tenant")Establish the relationship among the tenant, user, and
- role:
+ role:
$keystone user-role-add --user_id $NEUTRON_USER --role_id $ADMIN_ROLE --tenant_id $SERVICE_TENANTSee the OpenStack Installation Guides for more details about
- creating service entries and service users.
+ creating service entries and service users.
OpenStack Compute
@@ -118,7 +118,7 @@ catalog.$Region.network.internalURL = http://10.211.55.17:9696
IPs are proxied by OpenStack Compute to OpenStack Network APIs.
However, operator-facing tools (for example, nova-manage) are not proxied and
- should not be used.
+ should not be used.
When you
configure networking, you must use this guide. Do not rely on OpenStack
@@ -144,11 +144,11 @@ catalog.$Region.network.internalURL = http://10.211.55.17:9696
nova-network.
- To ensure that OpenStack Compute works properly with
+ To ensure that OpenStack Compute works properly with
OpenStack Networking (rather than the legacy nova-network mechanism), you must
adjust settings in the nova.conf
- configuration file.
+ configuration file.Networking API & and Credential Configuration
@@ -158,7 +158,7 @@ catalog.$Region.network.internalURL = http://10.211.55.17:9696
standard API. For this to happen, you must configure the
following items in the nova.conf file (used
by each nova-compute
- and nova-api instance).
+ and nova-api instance).
Update to the OpenStack Identity server IP and
port. This is the Identity (keystone) admin API server
IP and port value, and not the Identity service API IP
- and port.
+ and port.
@@ -228,10 +228,10 @@ catalog.$Region.network.internalURL = http://10.211.55.17:9696
you should always disable built-in security groups and proxy all
security group calls to the OpenStack Networking API . If you do
not, security policies will conflict by being simultaneously
- applied by both services.
+ applied by both services.
To proxy security groups to OpenStack Networking, use the
following configuration values in
- nova.conf:
+ nova.conf:
Update to neutron, so that all
security group requests are proxied to the OpenStack
- Network Service.
+ Network Service.
@@ -268,9 +268,9 @@ catalog.$Region.network.internalURL = http://10.211.55.17:9696
those requests to nova-api, even when the requests are made from
isolated networks, or from multiple networks that use
- overlapping IP addresses.
+ overlapping IP addresses.
To enable proxying the requests, you must update the
- following fields in nova.conf.
+ following fields in nova.conf.
Update to a string "password" value. You must also
configure the same value in the
metadata_agent.ini file, to
- authenticate requests made for metadata.
+ authenticate requests made for metadata.
The default value of an empty string in both files
will allow metadata to function, but will not be secure
if any non-trusted entities have access to the metadata
APIs exposed by nova-api.
+ >nova-api.
@@ -318,7 +318,7 @@ catalog.$Region.network.internalURL = http://10.211.55.17:9696
class="service">nova-api instance exposes
metadata APIs is determined by the value of
enabled_apis in its
- nova.conf.
+ nova.conf.
@@ -330,8 +330,8 @@ catalog.$Region.network.internalURL = http://10.211.55.17:9696
Networking plugins may require different types of vif-plugging.
You must specify the type of vif-plugging to be used for each
nova-compute instance
- in the nova.conf file.
- The following plugins support the "port bindings" API
+ in the nova.conf file.
+ The following plugins support the "port bindings" API
extension that allows Nova to query for the type of vif-plugging
required:
@@ -357,19 +357,19 @@ catalog.$Region.network.internalURL = http://10.211.55.17:9696
For these plugins, the default values in
nova.conf are sufficient. For other
plugins, see the sub-sections below for vif-plugging
- configuration, or consult external plugin documentation.
+ configuration, or consult external plugin documentation.The vif-plugging configuration required for nova-compute might vary even
within a single deployment if your deployment includes
heterogeneous compute platforms (for example, some Compute
- hosts are KVM while others are ESX).
+ hosts are KVM while others are ESX).
Vif-plugging with Nicira NVP PluginThe choice of vif-plugging for the NVP Plugin depends on
which version of libvirt you use. To check your libvirt
- version, use:
+ version, use:
$libvirtd versionIn the nova.conf file, update the
libvirt_vif_driver value, depending on
@@ -412,7 +412,7 @@ catalog.$Region.network.internalURL = http://10.211.55.17:9696
/etc/libvirt/qemu.conf, uncomment the
entry for 'cgroup_device_acl', add the value '/dev/net/tun'
to the list of items for the configuration entry, and then
- restart libvirtd.
+ restart libvirtd.
diff --git a/doc/install-guide/section_networking-provider-router-with-private_networks.xml b/doc/install-guide/section_networking-provider-router-with-private_networks.xml
index dbc2de7ee2..d835cab8c5 100644
--- a/doc/install-guide/section_networking-provider-router-with-private_networks.xml
+++ b/doc/install-guide/section_networking-provider-router-with-private_networks.xml
@@ -20,7 +20,7 @@
Because you run the DHCP agent and L3 agent on one node, you must set
use_namespaces to True (which is the default)
- in both agents' configuration files.
+ in both agents' configuration files.
diff --git a/doc/install-guide/section_networking-single-flat.xml b/doc/install-guide/section_networking-single-flat.xml
index 81b56d7df5..58a5a950f3 100644
--- a/doc/install-guide/section_networking-single-flat.xml
+++ b/doc/install-guide/section_networking-single-flat.xml
@@ -1,6 +1,6 @@
Single Flat NetworkThis section describes how to install the OpenStack Networking service and its components
diff --git a/doc/training-guide/associate-horizon-cli-operations.xml b/doc/training-guide/associate-horizon-cli-operations.xml
index c7f7635cc5..5d130d78ee 100644
--- a/doc/training-guide/associate-horizon-cli-operations.xml
+++ b/doc/training-guide/associate-horizon-cli-operations.xml
@@ -5,7 +5,7 @@
version="5.0"
xml:id="using-horizon-cli">
Using Horizon and the CLI for Operations Tasks
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharingSubmit a bug on
diff --git a/doc/training-guide/card006.xml b/doc/training-guide/card006.xml
index 3dc36f48fd..2c498c0a1c 100644
--- a/doc/training-guide/card006.xml
+++ b/doc/training-guide/card006.xml
@@ -6,11 +6,11 @@
xml:id="configure-virtualbox">
VirtualBox Basics
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharingSubmit a bug on
the section above. Short description for the bug summary. Paragraph for the description and
then tag with training-manuals.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/card007-core-overview.xml b/doc/training-guide/card007-core-overview.xml
index ba479c0dd0..8287799bee 100644
--- a/doc/training-guide/card007-core-overview.xml
+++ b/doc/training-guide/card007-core-overview.xml
@@ -6,11 +6,11 @@
xml:id="card007-core-overview">
Core Project Overview
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharingSubmit a bug on
the section above. Short description for the bug summary. Paragraph for the description and
then tag with training-manuals.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/card008.xml b/doc/training-guide/card008.xml
index 5b253339eb..46b8ca34f8 100644
--- a/doc/training-guide/card008.xml
+++ b/doc/training-guide/card008.xml
@@ -6,7 +6,7 @@
xml:id="card008-Understand_refstack_architecture">
Understanding the RefStack Architecture
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing
diff --git a/doc/training-guide/card009.xml b/doc/training-guide/card009.xml
index cc408616a3..3f2368776f 100644
--- a/doc/training-guide/card009.xml
+++ b/doc/training-guide/card009.xml
@@ -5,15 +5,15 @@
xml:id="install-ubuntu">
Install Ubuntu
-
Submit a bug on
the section above. Short description for the bug summary. Paragraph for the description and
then tag with training-manuals.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/card011.xml b/doc/training-guide/card011.xml
index 03d8e6b553..4606f979da 100644
--- a/doc/training-guide/card011.xml
+++ b/doc/training-guide/card011.xml
@@ -5,7 +5,7 @@
version="5.0"
xml:id="card011-Installing_MySQL_Database_service">
Installing MySQL
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing
diff --git a/doc/training-guide/card025.xml b/doc/training-guide/card025.xml
index 97f87eed45..225c85e5f6 100644
--- a/doc/training-guide/card025.xml
+++ b/doc/training-guide/card025.xml
@@ -5,11 +5,11 @@
xml:id="role-controller-node">
Role of the Controller Node
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharingSubmit a bug on
the section above. Short description for the bug summary. Paragraph for the description and
then tag with training-manuals.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/card037-rabbitmq.xml b/doc/training-guide/card037-rabbitmq.xml
index 4fe471b2cc..3ae89bfeb7 100644
--- a/doc/training-guide/card037-rabbitmq.xml
+++ b/doc/training-guide/card037-rabbitmq.xml
@@ -6,11 +6,11 @@
xml:id="card037-installing-rabbitMQ">
Installing RabbitMQ
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharingSubmit a bug on
the section above. Short description for the bug summary. Paragraph for the description and
then tag with training-manuals.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/card038.xml b/doc/training-guide/card038.xml
index e0922cf785..ad3b17473b 100644
--- a/doc/training-guide/card038.xml
+++ b/doc/training-guide/card038.xml
@@ -5,7 +5,7 @@
version="5.0"
xml:id="card038-Install-and-configure-OpenStack-Identity-Service-in-the-Controller-Node">
Install and configure OpenStack Identity Service in the Controller Node
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing
diff --git a/doc/training-guide/card039-nova.xml b/doc/training-guide/card039-nova.xml
index 9e2811ff69..b633a30543 100644
--- a/doc/training-guide/card039-nova.xml
+++ b/doc/training-guide/card039-nova.xml
@@ -6,7 +6,7 @@
xml:id="configure-nova">
Install Nova
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing
diff --git a/doc/training-guide/card040-cinder.xml b/doc/training-guide/card040-cinder.xml
index 521d3224ac..d65f5059f0 100644
--- a/doc/training-guide/card040-cinder.xml
+++ b/doc/training-guide/card040-cinder.xml
@@ -6,7 +6,7 @@
xml:id="configure-block-storage">
Install Cinder
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing
diff --git a/doc/training-guide/card041-neutron.xml b/doc/training-guide/card041-neutron.xml
index 62343becd3..66ac106a37 100644
--- a/doc/training-guide/card041-neutron.xml
+++ b/doc/training-guide/card041-neutron.xml
@@ -8,12 +8,12 @@
Install OpenVSwitchOpenVSwitch is one of many options, but for now we will stick with OVS.
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharingInstall Neutron
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing
diff --git a/doc/training-guide/card043-ovs-in-network-node.xml b/doc/training-guide/card043-ovs-in-network-node.xml
index e4a3d017d2..1650bad052 100644
--- a/doc/training-guide/card043-ovs-in-network-node.xml
+++ b/doc/training-guide/card043-ovs-in-network-node.xml
@@ -7,11 +7,11 @@
OVS Installation and Configuration in Network node
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharingSubmit a bug on
the section above. Short description for the bug summary. Paragraph for the description and
then tag with training-manuals.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/card046-L3_Configuration_in_the_Network_Node.xml b/doc/training-guide/card046-L3_Configuration_in_the_Network_Node.xml
index 87952b7450..8f1e3682d9 100644
--- a/doc/training-guide/card046-L3_Configuration_in_the_Network_Node.xml
+++ b/doc/training-guide/card046-L3_Configuration_in_the_Network_Node.xml
@@ -4,9 +4,9 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
version="5.0"
xml:id="card046-L3_Configuration_in_the_Network_Node">
- L3 Configuration in the Network Node
+ L3 Configuration in the Network Node
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing
diff --git a/doc/training-guide/card047-install-nova-compute.xml b/doc/training-guide/card047-install-nova-compute.xml
index 697c89cee7..1c5d87d3fa 100644
--- a/doc/training-guide/card047-install-nova-compute.xml
+++ b/doc/training-guide/card047-install-nova-compute.xml
@@ -6,7 +6,7 @@
xml:id="card047-install_nova_compute">
Installing Nova
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing
diff --git a/doc/training-guide/card074-horizon-snapshots.xml b/doc/training-guide/card074-horizon-snapshots.xml
index bb0546c185..2ac83f1fa6 100644
--- a/doc/training-guide/card074-horizon-snapshots.xml
+++ b/doc/training-guide/card074-horizon-snapshots.xml
@@ -7,11 +7,11 @@
Creating SnapshotsCreating image snapshots using Horizon
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharingSubmit a bug on
the section above. Short description for the bug summary. Paragraph for the description and
then tag with training-manuals.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/card126-horizon.xml b/doc/training-guide/card126-horizon.xml
index 3995a0cfcf..d877ece64a 100644
--- a/doc/training-guide/card126-horizon.xml
+++ b/doc/training-guide/card126-horizon.xml
@@ -6,7 +6,7 @@
xml:id="configure-dashboard">
Install Horizon
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharingSubmit a bug on
diff --git a/doc/training-guide/card127-glance.xml b/doc/training-guide/card127-glance.xml
index dac4c6d6c5..338e9f1a47 100644
--- a/doc/training-guide/card127-glance.xml
+++ b/doc/training-guide/card127-glance.xml
@@ -6,11 +6,11 @@
xml:id="configure-image">
Install Glance
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharingSubmit a bug on
the section above. Short description for the bug summary. Paragraph for the description and
then tag with training-manuals.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/card128-swift.xml b/doc/training-guide/card128-swift.xml
index dca7540831..127e2d5401 100644
--- a/doc/training-guide/card128-swift.xml
+++ b/doc/training-guide/card128-swift.xml
@@ -6,7 +6,7 @@
xml:id="configure-swift">
Install Swift
- Remote content not availableimage sourcehttps://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing
diff --git a/doc/training-guide/lab000-virtualbox-basics.xml b/doc/training-guide/lab000-virtualbox-basics.xml
index 8c5b26504b..8e8d808748 100644
--- a/doc/training-guide/lab000-virtualbox-basics.xml
+++ b/doc/training-guide/lab000-virtualbox-basics.xml
@@ -32,7 +32,7 @@
OpenStack:OpenStack
Official Documentation (docs.openstack.org)Networking:Computer
- Networks (5th Edition) by Andrew S. Tanenbaum
+ Networks (5th Edition) by Andrew S. TanenbaumVirtualBox:Virtual Box
Manual (http://www.virtualbox.org/manual/UserManual.html)Requirements :
@@ -144,7 +144,7 @@
Setup Your VM EnvironmentBefore you can start configuring your Environment you need to
download some of the following stuff:
-
+
@@ -216,8 +216,7 @@
Vboxnet0
-
-
+
@@ -251,8 +250,8 @@
Vboxnet1
-
-
+
+
@@ -286,8 +285,7 @@
Vboxnet2
-
-
+
@@ -375,8 +373,7 @@
Configure the networks(Ignore the IP Address for now, you will set it up from
inside the VM)
-
-
+
@@ -450,8 +447,7 @@
Configure the networks(Ignore the IP Address for now, you will set it up from
inside the VM)
-
-
+
@@ -538,8 +534,7 @@
Configure the networks(Ignore the IP Address for now, you will set it up from
inside the VM)
-
-
+
@@ -648,5 +643,5 @@ $ping www.google.com
Ubuntu Server on the above setup Virtual Box Instances. In the
next section we will go through deploying OpenStack using the
above created Virtual Box instances.
-
-
\ No newline at end of file
+
+
diff --git a/doc/training-guide/lab001-compute-node.xml b/doc/training-guide/lab001-compute-node.xml
index 3dd7bbd4b4..a12951723e 100644
--- a/doc/training-guide/lab001-compute-node.xml
+++ b/doc/training-guide/lab001-compute-node.xml
@@ -26,7 +26,7 @@
used by virtual box VM’s for OpenStack networks, so that
OpenStack’s services can communicate with each other.
Compute Node
- Start your Controller Node the one you setup in previous
+ Start your Controller Node the one you setup in previous
section.Preparing Ubuntu
13.04/12.04
@@ -39,15 +39,15 @@
Add Grizzly repositories:
- #apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring
-# echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main >> /etc/apt/sources.list.d/grizzly.list
+ #apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring
+# echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main >> /etc/apt/sources.list.d/grizzly.list
- Update your system:
+ Update your system:#apt-get update
#apt-get upgrade
#apt-get dist-upgradeMore Content To be Added soon.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/lab001-control-node.xml b/doc/training-guide/lab001-control-node.xml
index 15513915b6..08c623e3cf 100644
--- a/doc/training-guide/lab001-control-node.xml
+++ b/doc/training-guide/lab001-control-node.xml
@@ -22,7 +22,7 @@
used by virtual box VM’s for OpenStack networks, so that
OpenStack’s services can communicate with each other.Controller Node
- Start your Controller Node the one you setup in previous
+ Start your Controller Node the one you setup in previous
section.Preparing Ubuntu
13.04/12.04
@@ -35,15 +35,15 @@
Add Grizzly repositories:
- #apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring
-# echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main >> /etc/apt/sources.list.d/grizzly.list
+ #apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring
+# echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main >> /etc/apt/sources.list.d/grizzly.list
- Update your system:
+ Update your system:#apt-get update
#apt-get upgrade
#apt-get dist-upgradeMore Content To be Added soon.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/lab002-network-node.xml b/doc/training-guide/lab002-network-node.xml
index c5b8c01727..c990eb4528 100644
--- a/doc/training-guide/lab002-network-node.xml
+++ b/doc/training-guide/lab002-network-node.xml
@@ -26,7 +26,7 @@
used by virtual box VM’s for OpenStack networks, so that
OpenStack’s services can communicate with each other.Network Node
- Start your Controller Node the one you setup in previous
+ Start your Controller Node the one you setup in previous
section.Preparing Ubuntu
13.04/12.04
@@ -39,15 +39,15 @@
Add Grizzly repositories:
- #apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring
-# echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main >> /etc/apt/sources.list.d/grizzly.list
+ #apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring
+# echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main >> /etc/apt/sources.list.d/grizzly.list
- Update your system:
+ Update your system:#apt-get update
#apt-get upgrade
#apt-get dist-upgradeMore Content To be Added soon.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/module001-ch001-intro-text.xml b/doc/training-guide/module001-ch001-intro-text.xml
index c2edd1bddc..c85b5fa3da 100644
--- a/doc/training-guide/module001-ch001-intro-text.xml
+++ b/doc/training-guide/module001-ch001-intro-text.xml
@@ -25,7 +25,7 @@
education and expanding its possibilities. Being open in nature,
these resources are free to use and modify, tailor them at no cost,
shape them as per your requirements and let the cloud do all the
- hard work.
+ hard work.
In data centers today, many computers suffer under-utilization
in computing power and networking bandwidth. For example, projects
may need a large amount of computing capacity to complete a
@@ -90,7 +90,7 @@
operates for a single organization, but can be managed on-premise
or off-premise. A public cloud has an infrastructure that is
available to the general public or a large industry group and is
- likely owned by a cloud services company.
+ likely owned by a cloud services company.
Clouds can also be described as hybrid. A hybrid cloud can be
a deployment model, as a composition of both public and private
clouds, or a hybrid model for cloud computing may involve both
@@ -110,7 +110,7 @@
technically, its reach and its impact on the entire world.OpenStack is an Open source software for building private and
public clouds which delivers a massively scalable cloud operating
- system.
+ system.
diff --git a/doc/training-guide/module001-ch002-brief-overview.xml b/doc/training-guide/module001-ch002-brief-overview.xml
index d95a5c7826..173b451526 100644
--- a/doc/training-guide/module001-ch002-brief-overview.xml
+++ b/doc/training-guide/module001-ch002-brief-overview.xml
@@ -80,7 +80,7 @@
Who it's for:Enterprises, service providers, government and academic
institutions with physical hardware that would like to build a
- public or private cloud.
+ public or private cloud.
How it's being used today:Organizations like CERN, Cisco WebEx, DreamHost, eBay, the
Gap, HP, MercadoLibre, NASA, PayPal, Rackspace and University of
diff --git a/doc/training-guide/module001-ch005-vm-provisioning-walk-through.xml b/doc/training-guide/module001-ch005-vm-provisioning-walk-through.xml
index 7caed3f1b7..de855feb2b 100644
--- a/doc/training-guide/module001-ch005-vm-provisioning-walk-through.xml
+++ b/doc/training-guide/module001-ch005-vm-provisioning-walk-through.xml
@@ -24,7 +24,7 @@
based on budget and resource constraints as well as the
inevitable list of supported features and required technical
specifications. The majority of development is done with the KVM
- and Xen-based hypervisors. Refer to
+ and Xen-based hypervisors. Refer to
http://goo.gl/n7AXnC
@@ -236,4 +236,4 @@
VM provisioning. For launching a VM, you can either use
Command Line Interface or the OpenStack Horizon Dashboard.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/module001-ch006-overview-horizon-cli.xml b/doc/training-guide/module001-ch006-overview-horizon-cli.xml
index dbaef4aba1..dae2cc2c87 100644
--- a/doc/training-guide/module001-ch006-overview-horizon-cli.xml
+++ b/doc/training-guide/module001-ch006-overview-horizon-cli.xml
@@ -610,7 +610,7 @@
To SSH into your instance, you use the downloaded keypair
- file.
+ file.
To SSH into your instance
@@ -1080,7 +1080,7 @@
You can upload images through the glance client or the Image
Service API. You can also use the nova client to list images,
set and delete image metadata, delete images, and take a
- snapshot of a running instance to create an image.
+ snapshot of a running instance to create an image.
Manage images with the glance clientTo list or get details for images
@@ -1241,7 +1241,7 @@
You can also assign a floating IP address to a running
instance to make it accessible from outside the cloud. You
assign a floating IP address to an instance and attach a block
- storage device, or volume, for persistent storage.
+ storage device, or volume, for persistent storage.
Set up access and security for instancesWhen you launch a virtual machine, you can inject a key
pair, which provides SSH access to your instance. For this to
@@ -1295,7 +1295,7 @@
You can also assign a floating IP address to a running
instance to make it accessible from outside the cloud. You
assign a floating IP address to an instance and attach a block
- storage device, or volume, for persistent storage.
+ storage device, or volume, for persistent storage.Add or import keypairsTo add a keyYou can generate a keypair or upload an existing public
@@ -1619,7 +1619,7 @@
To gather the parameters to launch an instance
- On a shell, source the OpenStack RC file.
+ On a shell, source the OpenStack RC file.List the available flavors:
@@ -1704,7 +1704,7 @@
$ nova boot --flavor FLAVOR_ID --image IMAGE_ID
- --key_name KEY_NAME --user-data mydata.file \
+ --key_name KEY_NAME --user-data mydata.file \
--security_group SEC_GROUP NAME_FOR_INSTANCE --meta
KEY=VALUE --meta KEY=VALUE
@@ -1778,7 +1778,7 @@
# cinder create --image-id
397e713c-b95b-4186-ad46-6126863ea0a9 --display-name
- my-bootable-vol 8
+ my-bootable-vol 8Optionally, to configure your volume, see the
@@ -2047,7 +2047,7 @@
$ nova resize myCirrosServer 4 --poll
- Instance resizing... 100% completeFinished
+ Instance resizing... 100% completeFinishedShow the status for your server:
@@ -2191,7 +2191,7 @@
$ nova evacuate evacuated_server_name host_b
- --on-shared-storage
+ --on-shared-storage
Delete an instance
@@ -2315,7 +2315,7 @@
my-baremetal-flavor test
- |... wait for instance to become active ...
+ |... wait for instance to become active ...You can list bare metal nodes and interfaces. When a
@@ -2426,7 +2426,7 @@
local
- Created a new network:
+ Created a new network:Just as shown previous, the unknown option
diff --git a/doc/training-guide/module001-ch007-keystone-arch.xml b/doc/training-guide/module001-ch007-keystone-arch.xml
index 5a5cfa2638..ca64b1f8ca 100644
--- a/doc/training-guide/module001-ch007-keystone-arch.xml
+++ b/doc/training-guide/module001-ch007-keystone-arch.xml
@@ -6,7 +6,7 @@
xml:id="module001-ch007-keystone-arch">
Ketstone ArchitectureMore Content To be Added ...
-
+
Identity Service ConceptsThe Identity service performs the following
functions:
@@ -22,7 +22,7 @@
To understand the Identity Service, you must understand the
following concepts:
-
+
UserDigital representation of a person, system, or service who
uses OpenStack cloud services. Identity authentication
@@ -31,8 +31,7 @@
and may be assigned tokens to access resources. Users may be
directly assigned to a particular tenant and behave as if they
are contained in that tenant.
-
-
+
CredentialsData that is known only by a user that proves who they
are. In the Identity Service, examples are:
@@ -48,8 +47,7 @@
Service
-
-
+
AuthenticationThe act of confirming the identity of a user. The Identity
Service confirms an incoming request by validating a set of
@@ -58,8 +56,7 @@
In response to these credentials, the Identity Service issues
the user an authentication token, which the user provides in
subsequent requests.
-
-
+
TokenAn arbitrary bit of text that is used to access resources.
Each token has a scope which describes which resources are
@@ -70,30 +67,26 @@
support additional protocols in the future. The intent is for
it to be an integration service foremost, and not aspire to be
a full-fledged identity store and management solution.
-
-
+
TenantA container used to group or isolate resources and/or
identity objects. Depending on the service operator, a tenant
may map to a customer, account, organization, or
project.
-
-
+
ServiceAn OpenStack service, such as Compute (Nova), Object
Storage (Swift), or Image Service (Glance). Provides one or
more endpoints through which users can access resources and
perform operations.
-
-
+
EndpointAn network-accessible address, usually described by URL,
from where you access a service. If using an extension for
templates, you can create an endpoint template, which
represents the templates of all the consumable services that
are available across the regions.
-
-
+
RoleA personality that a user assumes that enables them to
perform a specific set of operations. A role includes a set of
@@ -112,9 +105,7 @@
-
-
-
+
User managementThe main components of Identity user management are:
@@ -148,7 +139,7 @@
user the "compute-user" role in the "acme" tenant:$ keystone user-list$ keystone user-role-add --user=892585 --role=9a764e
- --tenant-id=6b8fd2
+ --tenant-id=6b8fd2
A user can be assigned different roles in different tenants:
for example, Alice may also have the "admin" role in the
"Cyberdyne" tenant. A user can also be assigned multiple roles
@@ -171,11 +162,9 @@
that there are no restrictions on which users can create
volumes: if the user has any role in a tenant, they will be able
to create volumes in that tenant.
-
+
-
-
-
+
Service
managementThe Identity Service provides the following service
@@ -194,5 +183,5 @@
service.The commands for creating services and endpoints are
described in a later section.
-
+
diff --git a/doc/training-guide/module001-ch009-vm-placement.xml b/doc/training-guide/module001-ch009-vm-placement.xml
index 6d0a49bae6..041a047033 100644
--- a/doc/training-guide/module001-ch009-vm-placement.xml
+++ b/doc/training-guide/module001-ch009-vm-placement.xml
@@ -44,13 +44,12 @@
(ComputeFilter).
-
-
+
Filter SchedulerThe Filter Scheduler supports filtering and weighting to
make informed decisions on where a new instance should be created.
This Scheduler supports only working with Compute Nodes.
-
+
FilteringFiltering
@@ -124,16 +123,16 @@
these)Examples are: ">= 5", "s== 2.1.0", "<in> gcc",
and "<or> fpu <or> gpu"
class RamFilter(filters.BaseHostFilter):
- """Ram Filter with over subscription flag"""
-
- def host_passes(self, host_state, filter_properties):
- """Only return hosts with sufficient available RAM."""
+ """Ram Filter with over subscription flag"""
- instance_type = filter_properties.get('instance_type')
- requested_ram = instance_type['memory_mb']
- free_ram_mb = host_state.free_ram_mb
- total_usable_ram_mb = host_state.total_usable_ram_mb
- used_ram_mb = total_usable_ram_mb - free_ram_mb
+ def host_passes(self, host_state, filter_properties):
+ """Only return hosts with sufficient available RAM."""
+
+ instance_type = filter_properties.get('instance_type')
+ requested_ram = instance_type['memory_mb']
+ free_ram_mb = host_state.free_ram_mb
+ total_usable_ram_mb = host_state.total_usable_ram_mb
+ used_ram_mb = total_usable_ram_mb - free_ram_mb
return total_usable_ram_mb * FLAGS.ram_allocation_ratio - used_ram_mb >= requested_ramHere ram_allocation_ratio means the virtual RAM to
physical RAM allocation ratio (it is 1.5 by default). Really,
@@ -177,9 +176,7 @@
are also called isolated. This Scheduler checks if
image_isolated flag named in instance specifications is the
same that the host has.
-
-
-
+
WeightsFilter Scheduler uses so-called weightsduring its
work.
diff --git a/doc/training-guide/module001-ch010-vm-provisioning-indepth.xml b/doc/training-guide/module001-ch010-vm-provisioning-indepth.xml
index dd5dd57303..f4a520aad2 100644
--- a/doc/training-guide/module001-ch010-vm-provisioning-indepth.xml
+++ b/doc/training-guide/module001-ch010-vm-provisioning-indepth.xml
@@ -81,13 +81,13 @@
upload image from image storage.
- glance-api validates the auth-token with keystone.
+ glance-api validates the auth-token with keystone.nova-compute get the image metadata.nova-compute does the REST-call by passing auth-token to
Network API to allocate and configure the network such that
- instance gets the IP address.
+ instance gets the IP address.
quantum-server validates the auth-token with
diff --git a/doc/training-guide/module002-ch003-neutron-use-cases.xml b/doc/training-guide/module002-ch003-neutron-use-cases.xml
index 22fb912175..bb12caab09 100644
--- a/doc/training-guide/module002-ch003-neutron-use-cases.xml
+++ b/doc/training-guide/module002-ch003-neutron-use-cases.xml
@@ -6,7 +6,7 @@
xml:id="module002-ch003-neutron-use-cases">
Neutron Use CasesAs of now you must be wondering, how to use these awesome
- features that OpenStack Networking has given to us.
+ features that OpenStack Networking has given to us.Use Case: Single Flat
NetworkIn the simplest use case, a single OpenStack Networking
diff --git a/doc/training-guide/module002-ch004-security-in-neutron.xml b/doc/training-guide/module002-ch004-security-in-neutron.xml
index 52a3b5403f..c8f1695102 100644
--- a/doc/training-guide/module002-ch004-security-in-neutron.xml
+++ b/doc/training-guide/module002-ch004-security-in-neutron.xml
@@ -28,7 +28,7 @@
restart nova-api and nova-compute in order to pick up this
change. After this change is made one will be able to use
both the OpenStack Compute and OpenStack Network security
- group API at the same time.
+ group API at the same time.
Authentication and AuthorizationOpenStack Networking uses the OpenStack Identity service
(project name keystone) as the default authentication
@@ -137,4 +137,4 @@
identifier of the user submitting the request.
-
\ No newline at end of file
+
diff --git a/doc/training-guide/module003-ch004-swift-building-blocks.xml b/doc/training-guide/module003-ch004-swift-building-blocks.xml
index 745b380568..683d9948ba 100644
--- a/doc/training-guide/module003-ch004-swift-building-blocks.xml
+++ b/doc/training-guide/module003-ch004-swift-building-blocks.xml
@@ -260,7 +260,7 @@
through a few scenarios and introduce the components.
Bird-eye ViewUpload
-
+
A client uses the REST API to make a HTTP request to PUT
an object into an existing Container. The cluster receives
the request. First, the system must figure out where the
@@ -284,12 +284,12 @@
- Download
+ DownloadA request comes in for an Account/Container/object.
Using the same consistent hashing, the Partition name is
generated. A lookup in the Ring reveals which storage
nodes contain that Partition. A request is made to one of
the storage nodes to fetch the object and if that fails,
requests are made to the other nodes.
-
-
\ No newline at end of file
+
+
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 efd42f3095..267348b56a 100644
--- a/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml
@@ -144,7 +144,7 @@
-
+
View default project quotas
diff --git a/doc/user-guide-admin/section_nova_specify_host.xml b/doc/user-guide-admin/section_nova_specify_host.xml
index 70475b1ae7..a67b6a2ab0 100644
--- a/doc/user-guide-admin/section_nova_specify_host.xml
+++ b/doc/user-guide-admin/section_nova_specify_host.xml
@@ -6,13 +6,13 @@
Select on which host instances are launchedWith the appropriate permissions, you can select on which
host instances are launched and which roles can boot instances
- on this host.
+ on this host.
To select the host where instances are launched, use the
--availability_zone
zone:host
- parameter on n the nova boot
+ parameter on the nova boot
command,
- For example:
+ For example:$nova boot --image <uuid> --flavor m1.tiny --key_name test --availability-zone nova:server2To specify which roles can launch an instance on a specified
host, enable the create:forced_host
diff --git a/doc/user-guide/section_heat_cli.xml b/doc/user-guide/section_heat_cli.xml
index 269aa31df7..35c2677ba1 100644
--- a/doc/user-guide/section_heat_cli.xml
+++ b/doc/user-guide/section_heat_cli.xml
@@ -7,7 +7,7 @@
xml:id="heat-stack-create">
Create and manage stacksCreate a stack from an example template file
-
+ To create a stack, or template, from an example template
@@ -54,7 +54,7 @@
+--------------------------------------+---------------+-----------------+----------------------+
-
+
To show the details of a stack, run the following
command:$heat stack-show mystack
diff --git a/doc/user-guide/section_swift_cli_howto.xml b/doc/user-guide/section_swift_cli_howto.xml
index 0f16cf9c90..24d1466d3e 100644
--- a/doc/user-guide/section_swift_cli_howto.xml
+++ b/doc/user-guide/section_swift_cli_howto.xml
@@ -13,10 +13,10 @@
library, client.py, which seamlessly
re-authenticates if the current token expires during
processing, retries operations multiple times, and provides a
- processing concurrency of 10.
+ processing concurrency of 10.
Users have roles on accounts. For example, the admin
role enables full access to all containers and objects in an
- account.
+ account.
You can set access control lists (ACLs) are set at the container level
and support lists for read and write access, which are set
with the X-Container-Read and