Fix config-reference and admin-guide-cloud builds

nova-ec2 was removed from nova for mitaka, remove the file ec2-api now.
A previous change already removed nova-ec2 table.

File compute/nova-logs was renamed to compute/logs, but was referenced
by other files. Add label so that reference works.

Replace internal references to non-existing documents in
admin-guide-cloud with external links.

Note: We hit these bugs in local tests depending on python package
versions, the packages in the gate ignore the error.

Change-Id: Idece9d7186321b8b40b3020f701531908f88b6a5
This commit is contained in:
Andreas Jaeger 2016-02-23 12:36:39 +01:00
parent a4883d4e4a
commit 211e44e1c1
6 changed files with 9 additions and 15 deletions

View File

@ -20,7 +20,8 @@ high availability.
For information about:
* administrative tasks on the command-line, see
:doc:`cli_admin_manage_stacks`.
the `OpenStack Admin User Guide
<http://docs.openstack.org/user-guide-admin/cli_admin_manage_stacks.html>`__.
.. note::

View File

@ -23,7 +23,8 @@ quotas for new tenants, as well as update quotas for existing tenants.
Using the command-line interface, you can manage quotas for the
OpenStack Compute service, the OpenStack Block Storage service, and
the OpenStack Networking service (see :doc:`cli_set_quotas`).
the OpenStack Networking service (see `OpenStack Admin User Guide
<http://docs.openstack.org/user-guide-admin/cli_set_quotas.html>`_).
Additionally, you can update Compute service quotas for
tenant users.
@ -110,4 +111,5 @@ Update project quotas
The dashboard does not show all possible project quotas.
To view and update the quotas for a service, use its
command-line client. See :doc:`cli_set_quotas`.
command-line client. See `OpenStack Admin User Guide
<http://docs.openstack.org/user-guide-admin/cli_set_quotas.html>`_.

View File

@ -12,7 +12,6 @@ Compute
compute/database-connections.rst
compute/rpc.rst
compute/api.rst
compute/ec2-api.rst
compute/fibre-channel.rst
compute/iscsi-offload.rst
compute/hypervisors.rst

View File

@ -1,10 +0,0 @@
=====================
Configure the EC2 API
=====================
You can set options in the ``nova.conf`` configuration file
to control which network address and port the EC2 API listens on,
the formatting of some API responses, and authentication related options.
To customize these options for OpenStack EC2 API, use the configuration
option settings documented in the table :ref:`nova-ec2`.

View File

@ -188,7 +188,7 @@ Troubleshoot Xen with Libvirt
across other issues, you should first consult the following log files:
* ``/var/log/nova/compute.log``
(for more information refer to :doc:`nova-logs`).
(for more information refer to :ref:`nova_logs`).
* ``/var/log/libvirt/libxl/libxl-driver.log``,
* ``/var/log/xen/qemu-dm-${instancename}.log``,
* ``/var/log/xen/xen-hotplug.log``,

View File

@ -1,3 +1,5 @@
.. _nova_logs:
=================
Compute log files
=================