From 74b6b7741bc7f254e39468a234e02408f33b0bbb Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Thu, 27 Jul 2017 12:12:55 -0400
Subject: [PATCH] add a redirect for the old cells landing page

Redirect from /nova/$series/cells.html to /nova/$series/admin/cells.html

Depends-On: I236b7b0a9aae065167bd0aef316603d258e4c3c6
Change-Id: I56b1c077dd604c2947c791c7d5ccdddb9fb815a2
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 doc/source/_extra/.htaccess | 5 +++++
 doc/source/conf.py          | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 doc/source/_extra/.htaccess

diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess
new file mode 100644
index 000000000000..23912c9c8fcd
--- /dev/null
+++ b/doc/source/_extra/.htaccess
@@ -0,0 +1,5 @@
+# As part of the doc-migration during Pike, the main cells landing page
+# moved. Redirect from the old to new location.
+redirectmatch 301 ^/nova/([^/]+)/cells.html$ /nova/$1/user/cells.html
+# This pattern should match the URL on the draft site
+redirectmatch 301 /doc/build/html/cells.html$ /nova/$1/user/cells.html
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 008be7558419..02875cac1a4b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -140,6 +140,10 @@ html_theme = 'openstackdocs'
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
+# Add any paths that contain "extra" files, such as .htaccess or
+# robots.txt.
+html_extra_path = ['_extra']
+
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 html_last_updated_fmt = '%Y-%m-%d %H:%M'