From 01c25f985bfbfcf42998f1c8bdac8ebe270d5b98 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Mon, 24 Aug 2015 19:26:05 +0200
Subject: [PATCH] Fix some problems found by checklink

Fix problems found by "tox -e checklink" - URLs that are not valid.

Change-Id: Ib7361f138282f8e04e2103a460f8bc0b1be48f48
---
 doc/admin-guide-cloud/source/compute-networking-nova.rst  | 2 +-
 doc/admin-guide-cloud/source/conf.py                      | 4 ++++
 .../source/telemetry-system-architecture.rst              | 8 ++++----
 doc/common-rst/support-compute.rst                        | 2 +-
 doc/common/section_support-compute.xml                    | 4 ++--
 doc/user-guide-admin/source/conf.py                       | 3 +++
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/doc/admin-guide-cloud/source/compute-networking-nova.rst b/doc/admin-guide-cloud/source/compute-networking-nova.rst
index 68b31ef126..baddd48ca6 100644
--- a/doc/admin-guide-cloud/source/compute-networking-nova.rst
+++ b/doc/admin-guide-cloud/source/compute-networking-nova.rst
@@ -135,7 +135,7 @@ compute node runs its own ``nova-network`` service. In both cases, all
 traffic between VMs and the internet flows through ``nova-network``. Each
 mode has benefits and drawbacks. For more on this, see the Network
 Topology section in the `OpenStack Operations Guide
-<http://http://docs.openstack.org/openstack-ops/content/network_design.html#network_topology>`__.
+<http://docs.openstack.org/openstack-ops/content/network_design.html#network_topology>`__.
 
 All networking options require network connectivity to be already set up
 between OpenStack physical nodes. OpenStack does not configure any
diff --git a/doc/admin-guide-cloud/source/conf.py b/doc/admin-guide-cloud/source/conf.py
index a341a73a3b..7f46af08d7 100644
--- a/doc/admin-guide-cloud/source/conf.py
+++ b/doc/admin-guide-cloud/source/conf.py
@@ -208,6 +208,10 @@ htmlhelp_basename = 'admin-guide-cloud'
 # If true, publish source files
 # html_copy_source = True
 
+# -- Options for linkcheck ------------------------------------------------
+linkcheck_ignore = [r'https://127.0.0.1',
+                    r'https://swift.example.com/']
+
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
diff --git a/doc/admin-guide-cloud/source/telemetry-system-architecture.rst b/doc/admin-guide-cloud/source/telemetry-system-architecture.rst
index 43a0f23656..6715a71670 100644
--- a/doc/admin-guide-cloud/source/telemetry-system-architecture.rst
+++ b/doc/admin-guide-cloud/source/telemetry-system-architecture.rst
@@ -79,9 +79,9 @@ events, samples, alarm definitions and alarms are stored.
 
 The list of supported database back ends:
 
--  `ElasticSearch (events only) <http://www.elasticsearch.org/>`__
+-  `ElasticSearch (events only) <https://www.elastic.co/>`__
 
--  `MongoDB <http://www.mongodb.org/>`__
+-  `MongoDB <https://www.mongodb.org/>`__
 
 -  `MySQL <http://www.mysql.com/>`__
 
@@ -149,9 +149,9 @@ external networking services:
 
 -  SDN controller meters:
 
-   -  `OpenDaylight <http://www.opendaylight.org/>`__
+   -  `OpenDaylight <https://www.opendaylight.org/>`__
 
-   -  `OpenContrail <http://opencontrail.org/>`__
+   -  `OpenContrail <http://www.opencontrail.org/>`__
 
 |
 
diff --git a/doc/common-rst/support-compute.rst b/doc/common-rst/support-compute.rst
index 0fbf390e6d..7a536f6a05 100644
--- a/doc/common-rst/support-compute.rst
+++ b/doc/common-rst/support-compute.rst
@@ -33,7 +33,7 @@ module in the :file:`nova.conf` file:
 If the log level is set to ``debug``, you can also specify
 ``logging_debug_format_suffix`` to append extra formatting.
 For information about what variables are available for the
-formatter see http://docs.python.org/library/logging.html#formatter.
+formatter see http://docs.python.org/library/logging.html#formatter-objects.
 
 You have two options for logging for OpenStack Compute based on
 configuration settings. In :file:`nova.conf`, include the
diff --git a/doc/common/section_support-compute.xml b/doc/common/section_support-compute.xml
index fb753cc730..03a7622dc5 100644
--- a/doc/common/section_support-compute.xml
+++ b/doc/common/section_support-compute.xml
@@ -35,8 +35,8 @@
                 <literal>logging_debug_format_suffix</literal> to
             append extra formatting. For information about what
             variables are available for the formatter see: <link
-                xlink:href="http://docs.python.org/library/logging.html#formatter"
-                >http://docs.python.org/library/logging.html#formatter</link>.</para>
+                xlink:href="http://docs.python.org/library/logging.html#formatter-objects"
+                >http://docs.python.org/library/logging.html#formatter-objects</link>.</para>
         <para>You have two options for logging for OpenStack Compute
             based on configuration settings. In
                 <filename>nova.conf</filename>, include the
diff --git a/doc/user-guide-admin/source/conf.py b/doc/user-guide-admin/source/conf.py
index 9775bbd737..a82247164f 100644
--- a/doc/user-guide-admin/source/conf.py
+++ b/doc/user-guide-admin/source/conf.py
@@ -209,6 +209,9 @@ htmlhelp_basename = 'user-guide-admin'
 # If true, publish source files
 # html_copy_source = True
 
+# -- Options for linkcheck ------------------------------------------------
+linkcheck_ignore = [r'https://build.opensuse.org']
+
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {