From 211e44e1c1d7bf9ffaaf54a66de1bb7b5a9e7cbc Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 23 Feb 2016 12:36:39 +0100 Subject: [PATCH] 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 --- .../source/dashboard_admin_manage_stacks.rst | 3 ++- doc/admin-guide-cloud/source/dashboard_set_quotas.rst | 6 ++++-- doc/config-reference/source/compute.rst | 1 - doc/config-reference/source/compute/ec2-api.rst | 10 ---------- .../source/compute/hypervisor-xen-libvirt.rst | 2 +- doc/config-reference/source/compute/logs.rst | 2 ++ 6 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 doc/config-reference/source/compute/ec2-api.rst diff --git a/doc/admin-guide-cloud/source/dashboard_admin_manage_stacks.rst b/doc/admin-guide-cloud/source/dashboard_admin_manage_stacks.rst index 705c171176..af2127cdcb 100644 --- a/doc/admin-guide-cloud/source/dashboard_admin_manage_stacks.rst +++ b/doc/admin-guide-cloud/source/dashboard_admin_manage_stacks.rst @@ -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 + `__. .. note:: diff --git a/doc/admin-guide-cloud/source/dashboard_set_quotas.rst b/doc/admin-guide-cloud/source/dashboard_set_quotas.rst index b724ea423c..3a977d1191 100644 --- a/doc/admin-guide-cloud/source/dashboard_set_quotas.rst +++ b/doc/admin-guide-cloud/source/dashboard_set_quotas.rst @@ -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 + `_). 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 + `_. diff --git a/doc/config-reference/source/compute.rst b/doc/config-reference/source/compute.rst index debc0bb3b0..3d098ba91e 100644 --- a/doc/config-reference/source/compute.rst +++ b/doc/config-reference/source/compute.rst @@ -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 diff --git a/doc/config-reference/source/compute/ec2-api.rst b/doc/config-reference/source/compute/ec2-api.rst deleted file mode 100644 index b7bcaf3b2d..0000000000 --- a/doc/config-reference/source/compute/ec2-api.rst +++ /dev/null @@ -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`. diff --git a/doc/config-reference/source/compute/hypervisor-xen-libvirt.rst b/doc/config-reference/source/compute/hypervisor-xen-libvirt.rst index 26f3c8fc55..fcb899653a 100644 --- a/doc/config-reference/source/compute/hypervisor-xen-libvirt.rst +++ b/doc/config-reference/source/compute/hypervisor-xen-libvirt.rst @@ -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``, diff --git a/doc/config-reference/source/compute/logs.rst b/doc/config-reference/source/compute/logs.rst index 396eab9b88..5778b47536 100644 --- a/doc/config-reference/source/compute/logs.rst +++ b/doc/config-reference/source/compute/logs.rst @@ -1,3 +1,5 @@ +.. _nova_logs: + ================= Compute log files =================