From e1c269b742a2922970347214b759331c2fefa412 Mon Sep 17 00:00:00 2001
From: jichen <jichenjc@cn.ibm.com>
Date: Thu, 3 May 2018 17:46:53 +0800
Subject: [PATCH] [doc]remove nova-cert leftover in doc

commit f2121f5880d10a2dd1b085575d0f2a60dd2b1512
cleaned up nova-cert, this patched removed remainings in doc

Change-Id: I0adf653976ccda77d56a752d3b4408c57621a428
---
 doc/source/_extra/.htaccess             | 1 -
 doc/source/admin/configuration/logs.rst | 9 ++-------
 doc/source/admin/system-admin.rst       | 3 ---
 doc/test/redirect-tests.txt             | 1 -
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess
index 24cbe597f0de..529f1ba33e21 100644
--- a/doc/source/_extra/.htaccess
+++ b/doc/source/_extra/.htaccess
@@ -36,7 +36,6 @@ redirectmatch 301 ^/nova/([^/]+)/man/nova-api-os-compute.html$ /nova/$1/cli/nova
 redirectmatch 301 ^/nova/([^/]+)/man/nova-api.html$ /nova/$1/cli/nova-api.html
 redirectmatch 301 ^/nova/([^/]+)/man/nova-cells.html$ /nova/$1/cli/nova-cells.html
 # this is gone and never coming back, indicate that to the end users
-redirectmatch 410 ^/nova/([^/]+)/man/nova-cert.html$
 redirectmatch 301 ^/nova/([^/]+)/man/nova-compute.html$ /nova/$1/cli/nova-compute.html
 redirectmatch 301 ^/nova/([^/]+)/man/nova-conductor.html$ /nova/$1/cli/nova-conductor.html
 redirectmatch 301 ^/nova/([^/]+)/man/nova-console.html$ /nova/$1/cli/nova-console.html
diff --git a/doc/source/admin/configuration/logs.rst b/doc/source/admin/configuration/logs.rst
index 396eab9b88cf..74d3919fcc48 100644
--- a/doc/source/admin/configuration/logs.rst
+++ b/doc/source/admin/configuration/logs.rst
@@ -16,9 +16,6 @@ The corresponding log file of each Compute service is stored in the
    * - ``nova-api.log``
      - ``openstack-nova-api``
      - ``nova-api``
-   * - ``nova-cert.log`` [#a]_
-     - ``openstack-nova-cert``
-     - ``nova-cert``
    * - ``nova-compute.log``
      - ``openstack-nova-compute``
      - ``nova-compute``
@@ -28,7 +25,7 @@ The corresponding log file of each Compute service is stored in the
    * - ``nova-consoleauth.log``
      - ``openstack-nova-consoleauth``
      - ``nova-consoleauth``
-   * - ``nova-network.log`` [#b]_
+   * - ``nova-network.log`` [#a]_
      - ``openstack-nova-network``
      - ``nova-network``
    * - ``nova-manage.log``
@@ -40,8 +37,6 @@ The corresponding log file of each Compute service is stored in the
 
 .. rubric:: Footnotes
 
-.. [#a] The X509 certificate service (``openstack-nova-cert``/``nova-cert``)
-         is only required by the EC2 API to the Compute service.
-.. [#b] The ``nova`` network service (``openstack-nova-network``/
+.. [#a] The ``nova`` network service (``openstack-nova-network``/
          ``nova-network``) only runs in deployments that are not configured
          to use the Networking service (``neutron``).
diff --git a/doc/source/admin/system-admin.rst b/doc/source/admin/system-admin.rst
index eca39a625844..4480e6059271 100644
--- a/doc/source/admin/system-admin.rst
+++ b/doc/source/admin/system-admin.rst
@@ -40,9 +40,6 @@ responsibilities of services and drivers are:
   routes and authenticates requests. Supports the OpenStack Compute APIs. A
   ``nova.conf`` configuration file is created when Compute is installed.
 
-``nova-cert``
-  Manages certificates.
-
 ``nova-compute``
   Manages virtual machines. Loads a Service object, and exposes the public
   methods on ComputeManager through a Remote Procedure Call (RPC).
diff --git a/doc/test/redirect-tests.txt b/doc/test/redirect-tests.txt
index 3cfcf826856f..c73790cbf45a 100644
--- a/doc/test/redirect-tests.txt
+++ b/doc/test/redirect-tests.txt
@@ -29,7 +29,6 @@
 /nova/latest/man/nova-api.html 301 /nova/latest/cli/nova-api.html
 /nova/latest/man/nova-cells.html 301 /nova/latest/cli/nova-cells.html
 # this is gone and never coming back, indicate that to the end users
-/nova/latest/man/nova-cert.html 410
 /nova/latest/man/nova-compute.html 301 /nova/latest/cli/nova-compute.html
 /nova/latest/man/nova-conductor.html 301 /nova/latest/cli/nova-conductor.html
 /nova/latest/man/nova-console.html 301 /nova/latest/cli/nova-console.html