openstack/openstack-manuals
Code Issues Proposed changes

Merge "Fixed grammar mistakes in Cloud Administrator Guide"

Browse Source
This commit is contained in:
Jenkins 2015-10-11 17:31:09 +00:00 committed by Gerrit Code Review
commit 97c1be9d54
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/admin-guide-cloud/source/compute-flavors.rst
View File

@ -184,8 +184,8 @@ Bandwidth I/O
burst at peak speed (kilobytes). The rate is shared equally within burst at peak speed (kilobytes). The rate is shared equally within
domains connected to the network. domains connected to the network.
Below example sets network traffic bandwidth limits for existing The example below sets network traffic bandwidth limits for existing
flavor as follow: flavor as follows:
- Outbound traffic: - Outbound traffic:

4
doc/admin-guide-cloud/source/compute-images-instances.rst
View File

@ -67,11 +67,11 @@ images, as less data needs to be copied across the network.
A new empty ephemeral disk is also created, labeled ``vdb`` in this A new empty ephemeral disk is also created, labeled ``vdb`` in this
diagram. This disk is destroyed when you delete the instance. diagram. This disk is destroyed when you delete the instance.
The compute node connects to the attached ``cinder-volume`` using ISCSI. The The compute node connects to the attached ``cinder-volume`` using iSCSI. The
``cinder-volume`` is mapped to the third disk, labeled ``vdc`` in this ``cinder-volume`` is mapped to the third disk, labeled ``vdc`` in this
diagram. After the compute node provisions the vCPU and memory diagram. After the compute node provisions the vCPU and memory
resources, the instance boots up from root volume ``vda``. The instance resources, the instance boots up from root volume ``vda``. The instance
runs, and changes data on the disks (highlighted in red on the diagram). runs and changes data on the disks (highlighted in red on the diagram).
If the volume store is located on a separate network, the If the volume store is located on a separate network, the
``my_block_storage_ip`` option specified in the storage node ``my_block_storage_ip`` option specified in the storage node
configuration file directs image traffic to the compute node. configuration file directs image traffic to the compute node.

12
doc/admin-guide-cloud/source/compute-networking-nova.rst
View File

@ -63,7 +63,7 @@ Flat DHCP Network Manager
bridge into an Ethernet device (``flat_interface``, eth0 by bridge into an Ethernet device (``flat_interface``, eth0 by
default). For every instance, Compute allocates a fixed IP address default). For every instance, Compute allocates a fixed IP address
and configures dnsmasq with the MAC ID and IP address for the VM. and configures dnsmasq with the MAC ID and IP address for the VM.
dnsmasq does not take part in the IP address allocation process, it Dnsmasq does not take part in the IP address allocation process, it
only hands out IPs according to the mapping done by Compute. only hands out IPs according to the mapping done by Compute.
Instances receive their fixed IPs with the :command:`dhcpdiscover` command. Instances receive their fixed IPs with the :command:`dhcpdiscover` command.
These IPs are not assigned to any of the host's network interfaces, These IPs are not assigned to any of the host's network interfaces,
@ -199,7 +199,7 @@ Reference <http://docs.openstack.org/kilo/config-reference/content/>`__,
and `the dnsmasq and `the dnsmasq
documentation <http://www.thekelleys.org.uk/dnsmasq/docs/dnsmasq.conf.example>`__. documentation <http://www.thekelleys.org.uk/dnsmasq/docs/dnsmasq.conf.example>`__.
dnsmasq also acts as a caching DNS server for instances. You can specify Dnsmasq also acts as a caching DNS server for instances. You can specify
the DNS server that dnsmasq uses by setting the ``dns_server`` the DNS server that dnsmasq uses by setting the ``dns_server``
configuration option in :file:`/etc/nova/nova.conf`. This example configures configuration option in :file:`/etc/nova/nova.conf`. This example configures
dnsmasq to use Google's public DNS server: dnsmasq to use Google's public DNS server:
@ -208,7 +208,7 @@ dnsmasq to use Google's public DNS server:
dns_server=8.8.8.8 dns_server=8.8.8.8
dnsmasq logs to syslog (typically :file:`/var/log/syslog` or Dnsmasq logs to syslog (typically :file:`/var/log/syslog` or
:file:`/var/log/messages`, depending on Linux distribution). Logs can be :file:`/var/log/messages`, depending on Linux distribution). Logs can be
useful for troubleshooting, especially in a situation where VM instances useful for troubleshooting, especially in a situation where VM instances
boot successfully but are not reachable over the network. boot successfully but are not reachable over the network.
@ -230,7 +230,7 @@ Configure Compute to use IPv6 addresses
If you are using OpenStack Compute with ``nova-network``, you can put If you are using OpenStack Compute with ``nova-network``, you can put
Compute into dual-stack mode, so that it uses both IPv4 and IPv6 Compute into dual-stack mode, so that it uses both IPv4 and IPv6
addresses for communication. In dual-stack mode, instances can acquire addresses for communication. In dual-stack mode, instances can acquire
their IPv6 global unicast address by using a stateless address their IPv6 global unicast addresses by using a stateless address
auto-configuration mechanism [RFC 4862/2462]. IPv4/IPv6 dual-stack mode auto-configuration mechanism [RFC 4862/2462]. IPv4/IPv6 dual-stack mode
works with both ``VlanManager`` and ``FlatDHCPManager`` networking works with both ``VlanManager`` and ``FlatDHCPManager`` networking
modes. modes.
@ -296,7 +296,7 @@ command:
- When you use ``VlanManager``, the command increments the subnet ID - When you use ``VlanManager``, the command increments the subnet ID
to create subnet prefixes. Guest VMs use this prefix to generate to create subnet prefixes. Guest VMs use this prefix to generate
their IPv6 global unicast address. For example: their IPv6 global unicast addresses. For example:
.. code:: console .. code:: console
@ -476,7 +476,7 @@ instance-specific metadata. If you are running the nova-api service, you
must have ``metadata`` as one of the elements listed in the must have ``metadata`` as one of the elements listed in the
``enabled_apis`` configuration option in :file:`/etc/nova/nova.conf`. The ``enabled_apis`` configuration option in :file:`/etc/nova/nova.conf`. The
default ``enabled_apis`` configuration setting includes the metadata default ``enabled_apis`` configuration setting includes the metadata
service, so you should not need to modify it. service, so you do not need to modify it.
Hosts access the service at ``169.254.169.254:80``, and this is Hosts access the service at ``169.254.169.254:80``, and this is
translated to ``metadata_host:metadata_port`` by an iptables rule translated to ``metadata_host:metadata_port`` by an iptables rule