Merge "Renamed cli files for consistency"

This commit is contained in:
Jenkins 2014-01-06 21:21:13 +00:00 committed by Gerrit Code Review
commit f5b1df895f
71 changed files with 94 additions and 93 deletions

View File

@ -704,7 +704,7 @@ header: Date: Thu, 13 Sep 2012 20:27:36 GMT
+----+-----------+-----------+------+-----------+------+-------+-------------+
</computeroutput></screen>
</section>
<xi:include href="../common/section_customize_flavors.xml"/>
<xi:include href="../common/section_cli_nova_customize_flavors.xml"/>
<!-- <section xml:id="section_instance-creation">
<?dbhtml stop-chunking?>
<title>Instances</title>
@ -813,7 +813,7 @@ inject_password=true</programlisting>
><citetitle>OpenStack End User
Guide</citetitle></link>.</para>
</section>-->
<xi:include href="../common/section_nova_cli_volumes.xml"/>
<xi:include href="../common/section_cli_nova_volumes.xml"/>
<section xml:id="section_networking-nova">
<title>Networking with nova-network</title>
<para>Understanding the networking configuration options helps
@ -1834,7 +1834,7 @@ net.bridge.bridge-nf-call-ip6tables=0</programlisting>
</simplesect>
</section>
<xi:include
href="../common/section_nova_cli_usage_statistics.xml"/>
href="../common/section_cli_nova_usage_statistics.xml"/>
<section xml:id="section_manage-logs">
<title>Manage logs</title>
<simplesect>
@ -2111,7 +2111,7 @@ HostC p2 5 10240 150
absence of shared storage. The evacuate API provides
many benefits over manual recovery, such as
re-attachment of volumes and floating IPs.</para>
<xi:include href="../common/section_nova_cli_evacuate.xml"/>
<xi:include href="../common/section_cli_nova_evacuate.xml"/>
<section xml:id="nova-compute-node-down-manual-recovery">
<title>Manual recovery</title>
<para>For KVM/libvirt compute node recovery, see the

View File

@ -16,26 +16,26 @@
xml:id="nova_summary">
<title>Command reference</title>
<xi:include
href="section_keystone_cli_commands.xml"/>
href="section_cli_keystone_commands.xml"/>
<?hard page-break?>
<xi:include
href="section_glance_cli_commands.xml"/>
href="section_cli_glance_commands.xml"/>
<?hard page-break?>
<xi:include
href="section_neutron_cli_commands.xml"/>
href="section_cli_neutron_commands.xml"/>
<?hard page-break?>
<xi:include
href="section_nova_cli_commands.xml"/>
href="section_cli_nova_commands.xml"/>
<?hard page-break?>
<xi:include
href="section_cinder_cli_commands.xml"/>
href="section_cli_cinder_commands.xml"/>
<?hard page-break?>
<xi:include
href="section_swift_cli_commands.xml"/>
href="section_cli_swift_commands.xml"/>
<?hard page-break?>
<xi:include
href="section_heat_cli_commands.xml"/>
href="section_cli_heat_commands.xml"/>
<?hard page-break?>
<xi:include
href="section_ceilometer_cli_commands.xml"/>
href="section_cli_ceilometer_commands.xml"/>
</appendix>

View File

@ -404,7 +404,7 @@
</tbody>
</table>
</section>
<xi:include href="section_nova_cli_manage_images.xml"/>
<xi:include href="section_cli_nova_manage_images.xml"/>
<section xml:id="troubleshoot">
<title>Troubleshoot image creation</title>
<itemizedlist>

View File

@ -278,5 +278,5 @@
</procedure>
</section>
<?hard-pagebreak?>
<xi:include href="section_nova_boot_from_volume.xml"/>
<xi:include href="section_cli_nova_boot_from_volume.xml"/>
</section>

View File

@ -13,5 +13,5 @@
can be controlled so that cloud resources are optimized. Quotas
are currently enforced at the tenant (or project) level, rather
than by user.</para>
<xi:include href="section_nova_cli_quotas.xml"/>
<xi:include href="section_cli_nova_quotas.xml"/>
</section>

View File

@ -21,11 +21,12 @@
<para>The certificates can be world readable, but the private
key cannot be. The private key should only be readable by
the account that is going to sign tokens. When generating
files with the <command>keystone-mange pki_setup</command>
command, your best option is to run as the pki user. If
you run nova-manage as root, you can append
--keystone-user and --keystone-group parameters to set the
username and group keystone is going to run under.</para>
files with the <command>keystone-manage
pki_setup</command> command, your best option is to
run as the pki user. If you run nova-manage as root, you
can append --keystone-user and --keystone-group parameters
to set the username and group keystone is going to run
under.</para>
</warning>
<para>The values that specify where to read the certificates are
under the <literal>[signing]</literal> section of the

View File

@ -11,7 +11,7 @@
options.</para>
<section xml:id="configuring-openstack-compute-basics">
<?dbhtml stop-chunking?>
<title>Post-Installation Configuration</title>
<title>Post-installation configuration</title>
<para>Configuring your Compute installation involves many
configuration files: the <filename>nova.conf</filename> file,
@ -23,8 +23,8 @@
chapters.</para>
<section xml:id="setting-flags-in-nova-conf-file">
<title>Setting Configuration Options in the
<filename>nova.conf</filename> File</title>
<title>Set configuration options in the
<filename>nova.conf</filename> file</title>
<para>The configuration file <filename>nova.conf</filename> is
installed in <filename>/etc/nova</filename> by default. A

View File

@ -14,7 +14,7 @@
<xi:include href="../common/section_keystone_certificates-for-pki.xml"/>
<xi:include href="../common/section_keystone-ssl-config.xml"/>
<xi:include href="../common/section_keystone-external-auth.xml"/>
<xi:include href="../common/section_config_keystone_ldap.xml"/>
<xi:include href="../common/section_keystone_config_ldap.xml"/>
<xi:include href="identity/section_keystone-token-binding.xml"/>
<xi:include href="../common/section_keystone-sample-conf-files.xml"/>
</chapter>

View File

@ -29,8 +29,8 @@
<!--status: good, right place-->
<section xml:id="sample-nova-configuration-files">
<title>Example <filename>nova.conf</filename> Configuration
Files</title>
<title>Example <filename>nova.conf</filename> configuration
files</title>
<para>The following sections describe many of the configuration
option settings that can go into the
<filename>nova.conf</filename> files. Copies of each

View File

@ -513,7 +513,7 @@ ram_weight_multiplier=1.0</programlisting>
of spreading.</para>
</section>
<section xml:id="chance-scheduler">
<title>Chance Scheduler</title>
<title>Chance scheduler</title>
<?dbhtml stop-chunking?>
<para>As an administrator, you work with the
Filter Scheduler. However, the Compute service also uses
@ -522,7 +522,7 @@ ram_weight_multiplier=1.0</programlisting>
which randomly selects from lists of filtered hosts. It is
the default volume scheduler.</para>
</section>
<xi:include href="../../common/section_host_aggregates.xml"/>
<xi:include href="../../common/section_cli_nova_host_aggregates.xml"/>
<section xml:id="compute-scheduler-config-ref">
<title>Configuration reference</title>
<xi:include href="../../common/tables/nova-scheduling.xml"/>

View File

@ -35,7 +35,7 @@
<title>Administration Tasks</title>
<section xml:id="associate-identity-cli-commands">
<title>Identity CI Commands</title>
<xi:include href="../common/section_keystone_cli_example_usage.xml"
<xi:include href="../common/section_cli_keystone_example_usage.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'example-usage']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
@ -49,28 +49,28 @@
</section>
<section xml:id="associate-glance-cli-commands">
<title>Image CLI Commands</title>
<xi:include href="../common/section_glance_cli_commands.xml"
<xi:include href="../common/section_cli_glance_commands.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'glance_commands']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
</section>
<section xml:id="associate-glance-image-list">
<title>Image List Images</title>
<xi:include href="../common/section_glance_cli_manage_images.xml"
<xi:include href="../common/section_cli_glance_manage_images.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'glance-image-list']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
</section>
<section xml:id="associate-glance-image-add">
<title>Image Adding Images</title>
<xi:include href="../common/section_glance_cli_manage_images.xml"
<xi:include href="../common/section_cli_glance_manage_images.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'glance_add_image']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
</section>
<section xml:id="associate-glance-manage-images">
<title>Image Manage Images</title>
<xi:include href="../common/section_nova_cli_manage_images.xml"
<xi:include href="../common/section_cli_nova_manage_images.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'nova_manage_images']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>

View File

@ -35,42 +35,42 @@
<title>Administration Tasks</title>
<section xml:id="associate-block-storage-commands">
<title>Block Storage CLI Commands</title>
<xi:include href="../common/section_cinder_cli_commands.xml"
<xi:include href="../common/section_cli_cinder_commands.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'cinder_commands']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
</section>
<section xml:id="associate-block-storage-manage-volumes">
<title>Block Storage Manage Volumes</title>
<xi:include href="../common/section_cinder_cli_manage_volumes.xml"
<xi:include href="../common/section_cli_cinder_manage_volumes.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'cli_manage_volumes']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
</section>
<section xml:id="associate-nova-cli-commands">
<title>Compute CLI Commands</title>
<xi:include href="../common/section_nova_cli_commands.xml"
<xi:include href="../common/section_cli_nova_commands.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'novaclient_commands']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
</section>
<section xml:id="associate-nova-image-creation">
<title>Compute Image creation</title>
<xi:include href="../common/section_nova_cli_images.xml"
<xi:include href="../common/section_cli_nova_images.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'nova_manage_images']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
</section>
<section xml:id="associate-nova-boot-instance">
<title>Compute Boot Instance</title>
<xi:include href="../common/section_nova_boot_from_volume.xml"
<xi:include href="../common/section_cli_nova_boot_from_volume.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'boot_from_volume']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
</section>
<section xml:id="associate-nova-terminate-instance">
<title>Compute Terminate Instance</title>
<xi:include href="../common/section_nova_cli_terminate.xml"
<xi:include href="../common/section_cli_nova_terminate.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'terminating']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>

View File

@ -28,17 +28,17 @@
<title>Administration Tasks</title>
<section xml:id="associate-network-cli-commands">
<title>Network CLI Commands</title>
<xi:include href="../common/section_neutron_cli_commands.xml"
<xi:include href="../common/section_cli_neutron_commands.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'neutron_client_commands']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
</section>
<section xml:id="associate-network-manage">
<title>Manage Networks</title>
<xi:include href="../common/section_neutron_cli_manage_networks.xml"
<xi:include href="../common/section_cli_neutron_manage_networks.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'neutron_client_sample_commands']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
</section>
</section>
</chapter>
</chapter>

View File

@ -28,7 +28,7 @@
<title>Administration Tasks</title>
<section xml:id="associate-object-store-cli-commands">
<title>Object Storage CLI Commands</title>
<xi:include href="../common/section_swift_cli_commands.xml"
<xi:include href="../common/section_cli_swift_commands.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'swift_commands']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
@ -38,4 +38,4 @@
<para>Will be included from the swift developer reference</para>
</section>
</section>
</chapter>
</chapter>

View File

@ -6,21 +6,21 @@
xml:id="create-floating-ip">
<title>Create floating ip</title>
<!-- this maps to card070 user story title "create-floating-ip" -->
<xi:include href="../user-guide/section_nova_cli_floating_ips.xml"
<xi:include href="../user-guide/section_cli_nova_floating_ips.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'floating_ips_overview']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
<!-- this maps to card070 user story title "create-floating-ip" -->
<xi:include href="../user-guide/section_nova_cli_floating_ips.xml"
<xi:include href="../user-guide/section_cli_nova_floating_ips.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'floating_ips_proc']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
<!-- this maps to card070 user story title "create-floating-ip" -->
<xi:include href="../user-guide/section_nova_cli_floating_ips.xml"
<xi:include href="../user-guide/section_cli_nova_floating_ips.xml"
xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'floating_ip_allocate']/*[not(self::db:title)])">
<xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
</xi:include>
<para><link xlink:href="https://blueprints.launchpad.net/openstack-manuals/+filebug" xlink:show="new">Submit a bug on
the section above. Short description for the bug summary. Paragraph for the description and
then tag with training-manuals.</link></para>
</section>
</section>

View File

@ -19,23 +19,23 @@
href="../common/section_cli_help.xml"/>
<?hard-pagebreak?>
<xi:include
href="section_keystone_cli_manage_projects_users_roles.xml"/>
href="section_cli_keystone_manage_projects_users_roles.xml"/>
<?hard-pagebreak?>
<xi:include href="section_cli_manage_services.xml"/>
<?hard-pagebreak?>
<xi:include href="../common/section_glance_cli_manage_images.xml"/>
<xi:include href="../common/section_cli_glance_manage_images.xml"/>
<?hard-pagebreak?>
<xi:include href="../common/section_cinder_cli_manage_volumes.xml"/>
<xi:include href="../common/section_cli_cinder_manage_volumes.xml"/>
<?hard-pagebreak?>
<xi:include href="section_nova_cli_manage_flavors.xml"/>
<xi:include href="section_cli_nova_manage_flavors.xml"/>
<?hard-pagebreak?>
<xi:include href="section_nova_specify_host.xml"/>
<xi:include href="section_cli_nova_specify_host.xml"/>
<?hard-pagebreak?>
<xi:include href="../common/section_nova_cli_evacuate.xml"/>
<xi:include href="../common/section_cli_nova_evacuate.xml"/>
<?hard-pagebreak?>
<xi:include href="section_nova_cli_floating_ips.xml"/>
<xi:include href="section_cli_nova_floating_ips.xml"/>
<?hard-pagebreak?>
<xi:include href="section_keystone_cli_set_quotas.xml"/>
<xi:include href="section_cli_keystone_set_quotas.xml"/>
<?hard-pagebreak?>
<xi:include href="section_swift_cli_analyze_log_files.xml"/>
<xi:include href="section_cli_swift_analyze_log_files.xml"/>
</chapter>

View File

@ -380,5 +380,5 @@
</procedure>
</section>
</section>
<xi:include href="section_nova_cli_manage_projects_security.xml"/>
<xi:include href="section_cli_nova_manage_projects_security.xml"/>
</section>

View File

@ -47,7 +47,7 @@
</computeroutput></screen>
</para>
</note>
<xi:include href="../common/section_nova_cli_quotas.xml"/>
<xi:include href="section_cinder_cli_quotas.xml"/>
<xi:include href="../common/section_networking-quotas.xml"/>
<xi:include href="../common/section_cli_nova_quotas.xml"/>
<xi:include href="section_cli_cinder_quotas.xml"/>
<xi:include href="../common/section_cli_neutron-quotas.xml"/>
</section>

View File

@ -5,7 +5,7 @@
xml:id="section_cli_manage_services">
<?dbhtml stop-chunking?>
<title>Manage services</title>
<xi:include href="../common/section_keystone_cli_services.xml"/>
<xi:include href="../common/section_cli_keystone_services.xml"/>
<?hard-pagebreak?>
<xi:include href="section_nova_cli_services.xml"/>
<xi:include href="section_cli_nova_services.xml"/>
</section>

View File

@ -17,28 +17,28 @@
<?hard-pagebreak?>
<xi:include href="../common/section_cli_openrc.xml"/>
<xi:include
href="../common/section_glance_cli_manage_images.xml"/>
href="../common/section_cli_glance_manage_images.xml"/>
<?hard-pagebreak?>
<xi:include href="section_nova_cli_configure_instances.xml"/>
<xi:include href="section_cli_nova_configure_instances.xml"/>
<?hard-pagebreak?>
<xi:include href="../common/section_nova_cli_boot.xml"/>
<xi:include href="../common/section_cli_nova_boot.xml"/>
<?hard-pagebreak?>
<xi:include href="section_nova_cli_manage_instances.xml"/>
<xi:include href="section_cli_nova_manage_instances.xml"/>
<?hard-pagebreak?>
<xi:include href="../common/section_user-data.xml"/>
<!-- <xi:include href="../common/section_cli_nova_user-data.xml"/>
<?hard-pagebreak?>-->
<xi:include href="../common/section_cli_nova_userdata.xml"/>
<?hard-pagebreak?>
<xi:include href="../common/section_nova_cli_userdata.xml"/>
<?hard-pagebreak?>
<xi:include href="section_nova_cli_config-drive.xml"/>
<xi:include href="section_cli_nova_config-drive.xml"/>
<?hard-pagebreak?>
<xi:include
href="../common/section_neutron_cli_manage_networks.xml"/>
href="../common/section_cli_neutron_manage_networks.xml"/>
<?hard-pagebreak?>
<xi:include href="section_swift_cli_howto.xml"/>
<xi:include href="section_cli_swift_howto.xml"/>
<?hard-pagebreak?>
<xi:include href="section_cli_heat.xml"/>
<?hard-pagebreak?>
<xi:include href="section_ceilometer_cli.xml"/>
<xi:include href="section_cli_ceilometer.xml"/>
<?hard-pagebreak?>
<xi:include href="../common/section_cinder_cli_manage_volumes.xml"/>
<xi:include href="../common/section_cli_cinder_manage_volumes.xml"/>
</chapter>

View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
xml:id="cli_manage_instances">
<title>Manage instances and hosts</title>
<para>Instances are virtual machines that run inside the
cloud.</para>
<xi:include href="section_cli_nova_floating_ips.xml"/>
<xi:include href="../common/section_cli_nova_resizerebuild.xml"/>
<xi:include href="../common/section_cli_nova_startstop.xml"/>
<xi:include href="../common/section_cli_nova_reboot.xml"/>
<xi:include href="../common/section_cli_nova_terminate.xml"/>
<xi:include href="../common/section_cli_nova_get_console.xml"/>
<xi:include href="../common/section_cli_nova_baremetal.xml"/>
<xi:include
href="../common/section_cli_nova_usage_statistics.xml"/>
</section>

View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
xml:id="cli_manage_instances">
<title>Manage instances and hosts</title>
<para>Instances are virtual machines that run inside the
cloud.</para>
<xi:include href="section_nova_cli_floating_ips.xml"/>
<xi:include href="../common/section_nova_cli_resizerebuild.xml"/>
<xi:include href="../common/section_nova_cli_startstop.xml"/>
<xi:include href="../common/section_nova_cli_reboot.xml"/>
<xi:include href="../common/section_nova_cli_terminate.xml"/>
<xi:include href="../common/section_nova_cli_get_console.xml"/>
<xi:include href="../common/section_nova_cli_baremetal.xml"/>
<xi:include
href="../common/section_nova_cli_usage_statistics.xml"/>
</section>