Merge "Edits for consistency"

This commit is contained in:
Jenkins 2013-11-22 03:56:57 +00:00 committed by Gerrit Code Review
commit c5d52d8f99
2 changed files with 15 additions and 15 deletions

View File

@ -5,7 +5,7 @@
xml:id="nova-manage-services">
<title>Manage Compute services</title>
<para>You can enable and disable Compute services. The following
examples disable and enable the <systemitem role="service"
examples disable and enable the <systemitem class="service"
>nova-compute</systemitem> service.</para>
<procedure>
<step>

View File

@ -12,8 +12,8 @@
xlink:href="http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html"
>metadata service</link>.</para>
<para>One use case for the configuration drive is to pass a
networking configuration when DHCP is not being used to assign
IP addresses to instances. For example, you might pass the IP
networking configuration when you do not use DHCP to assign IP
addresses to instances. For example, you might pass the IP
configuration for the instance through the configuration
drive, which the instance can mount and access before the you
configure the network settings for the instance.</para>
@ -32,35 +32,35 @@
<listitem>
<para>To use configuration drive with libvirt,
xenserver, or vmware, you must first install the
<package>genisoimage</package> program on each
Compute host. Otherwise, instance do not boot
<package>genisoimage</package> package on each
Compute host. Otherwise, instances do not boot
properly.</para>
<para>Use the <literal>mkisofs_cmd</literal> flag to
set the path where you install the
<package>genisoimage</package> program. If
<package>genisoimage</package> is in same path
as the <systemitem role="service"
as the <systemitem class="service"
>nova-compute</systemitem> service, you do not
need to set this flag.</para>
<note>
<para>By default, Ubuntu packages do not install
this program. See bug <link
this package. See bug <link
xlink:href="https://bugs.launchpad.net/cloud-archive/+bug/1165174"
>#1165174</link>.</para>
</note>
</listitem>
<listitem>
<para>To use configuration drive with hyper-v, you
must set the value of the
<literal>mkisofs_cmd</literal> to the full
path to an installation of
<literal>mkisofs.exe</literal>. Additionally,
you must set the value of the
<literal>qemu_img_cmd</literal> flag in the
must set the <literal>mkisofs_cmd</literal> value
to the full path to an
<literal>mkisofs.exe</literal> installation.
Additionally, you must set the
<literal>qemu_img_cmd</literal> value in the
<literal>hyperv</literal> configuration
section to the full path to an installation of the
<literal>qemu-img</literal> command.</para>
section to the full path to an
<literal>qemu-img</literal> command
installation.</para>
</listitem>
</itemizedlist>
<itemizedlist>