From 70a95e3370bae2e3eedb30a8f0bd8fb2c942d02a Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 15 Jan 2016 13:24:10 +0100
Subject: [PATCH] Update links for RST CLI Reference
Update all links to new location.
Change-Id: Idbeb70df359c05b37aabbe276c4aa34d05d5dab4
---
api-quick-start/source/api-quick-start.rst | 4 ++--
.../identity-api/src/v2.0/wadl/identity-admin.wadl | 2 +-
firstapp/source/block_storage.rst | 5 +++--
firstapp/source/networking.rst | 7 ++++---
firstapp/source/orchestration.rst | 11 ++++++-----
www/index.html | 2 +-
6 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/api-quick-start/source/api-quick-start.rst b/api-quick-start/source/api-quick-start.rst
index 984567980..a581ba5e8 100644
--- a/api-quick-start/source/api-quick-start.rst
+++ b/api-quick-start/source/api-quick-start.rst
@@ -580,7 +580,7 @@ interface. Also, each OpenStack project has a related client project that
includes Python API bindings and a command-line interface (CLI).
For information about the command-line clients, see `OpenStack
-Command-Line Interface Reference <http://docs.openstack.org/cli-reference/content/>`__.
+Command-Line Interface Reference <http://docs.openstack.org/cli-reference/>`__.
Install the clients
-------------------
@@ -625,7 +625,7 @@ Before you can issue client commands, you must download and source the
For complete information about the OpenStack clients, including how to source
the ``openrc`` file, see `OpenStack End User Guide <http://docs.openstack.org/user-guide/>`__,
`OpenStack Admin User Guide <http://docs.openstack.org/user-guide-admin/>`__,
-and `OpenStack Command-Line Interface Reference <http://docs.openstack.org/cli-reference/content/>`__.
+and `OpenStack Command-Line Interface Reference <http://docs.openstack.org/cli-reference/>`__.
Launch an instance
------------------
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
index dff5f12bc..d12a91dbf 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
@@ -702,7 +702,7 @@
</para>
<para>
The <link
- xlink:href="http://docs.openstack.org/cli-reference/content/openstackclient_commands.html#openstackclient_subcommand_user_show_with_identity_api_v2">openstack
+ xlink:href="http://docs.openstack.org/cli-reference/openstack.html#openstack-user-show">openstack
user show</link> command supports showing user details by name
or ID. However, the command actually looks up the user ID for
a user name and queries the user by ID.
diff --git a/firstapp/source/block_storage.rst b/firstapp/source/block_storage.rst
index cc93efd21..b30a4338e 100644
--- a/firstapp/source/block_storage.rst
+++ b/firstapp/source/block_storage.rst
@@ -272,11 +272,12 @@ SDKs do not generally support the service yet, but you can use the
'trove' command-line client to work with it instead.
To install the 'trove' command-line client, see
-`Install the OpenStack command-line clients <http://docs.openstack.org/cli-reference/content/install_clients.html>`_.
+`Install the OpenStack command-line clients
+<http://docs.openstack.org/cli-reference/common/cli_install_openstack_command_line_clients.html#install-the-clients>`_.
To set up environment variables for your cloud in an :file:`openrc.sh`
file, see
-`Set environment variables using the OpenStack RC file <http://docs.openstack.org/cli-reference/content/cli_openrc.html>`_.
+`Set environment variables using the OpenStack RC file <http://docs.openstack.org/cli-reference/common/cli_set_environment_variables_using_openstack_rc.html>`_.
Ensure you have an :file:`openrc.sh` file, source it, and validate that
your trove client works: ::
diff --git a/firstapp/source/networking.rst b/firstapp/source/networking.rst
index 94c1c3349..84c48bf1c 100644
--- a/firstapp/source/networking.rst
+++ b/firstapp/source/networking.rst
@@ -67,10 +67,11 @@ Because the SDKs do not fully support the OpenStack Networking API, this
section uses the command-line clients.
Use this guide to install the 'neutron' command-line client:
-http://docs.openstack.org/cli-reference/content/install_clients.html
+http://docs.openstack.org/cli-reference/common/cli_install_openstack_command_line_clients.html#install-the-clients
-Use this guide to set up the necessary variables for your cloud in an 'openrc' file:
-http://docs.openstack.org/cli-reference/content/cli_openrc.html
+Use this guide to set up the necessary variables for your cloud in an
+'openrc' file:
+http://docs.openstack.org/cli-reference/common/cli_set_environment_variables_using_openstack_rc.html
Ensure you have an openrc.sh file, source it, and then check that your
neutron client works: ::
diff --git a/firstapp/source/orchestration.rst b/firstapp/source/orchestration.rst
index 93bf2d289..b510629e4 100644
--- a/firstapp/source/orchestration.rst
+++ b/firstapp/source/orchestration.rst
@@ -46,10 +46,11 @@ OpenStack. In this section, you use the 'heat' command-line client to access
the Orchestration API directly through template files.
Install the 'heat' command-line client by following this guide:
-http://docs.openstack.org/cli-reference/content/install_clients.html
+http://docs.openstack.org/cli-reference/common/cli_install_openstack_command_line_clients.html#install-the-clients
-Use this guide to set up the necessary variables for your cloud in an 'openrc' file:
-http://docs.openstack.org/cli-reference/content/cli_openrc.html
+Use this guide to set up the necessary variables for your cloud in an
+'openrc' file:
+http://docs.openstack.org/cli-reference/common/cli_set_environment_variables_using_openstack_rc.html
.. only:: dotnet
@@ -206,12 +207,12 @@ The example template depends on the ceilometer project, which is part of the
To better understand how the template works, use this guide to install the
'ceilometer' command-line client:
-* http://docs.openstack.org/cli-reference/content/install_clients.html
+* http://docs.openstack.org/cli-reference/common/cli_install_openstack_command_line_clients.html#install-the-clients
To set up the necessary variables for your cloud in an 'openrc' file, use this
guide:
-* http://docs.openstack.org/cli-reference/content/cli_openrc.html
+* http://docs.openstack.org/cli-reference/common/cli_set_environment_variables_using_openstack_rc.html
The Telemetry service uses meters to measure a given aspect of a resources
usage. The meter that we are interested in is the :code:`cpu_util` meter.
diff --git a/www/index.html b/www/index.html
index 02c8659b8..f101acb4f 100644
--- a/www/index.html
+++ b/www/index.html
@@ -758,7 +758,7 @@
</a>
</dd>
<dd>
- <a class="link" href="http://docs.openstack.org/cli-reference/content/" target="_top">
+ <a class="link" href="http://docs.openstack.org/cli-reference/" target="_top">
CLI Reference Manual
</a>
</dd>