From c2e9f3358977fced05e8a62fb21943a57c67d15f Mon Sep 17 00:00:00 2001
From: Maxime Guyot <maxime.guyot@elits.com>
Date: Thu, 26 Oct 2017 19:08:10 +0200
Subject: [PATCH] Disable HTTP redirection for subdir of /deploy/

Change-Id: I0f7ba59e052d875ae17e56fc83ef19f888994b5d
Closes-Bug: #1727791
---
 www/.htaccess              | 4 ++--
 www/project-data/pike.yaml | 2 --
 www/redirect-tests.txt     | 6 ++++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/www/.htaccess b/www/.htaccess
index 8bcca55a17..c014b288a5 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -140,8 +140,8 @@ redirect 301 /doc-contrib-guide/ui-text-guidelines.html /doc-contrib-guide/ux-ui
 redirect 301 /doc-contrib-guide/ui-text-guidelines /doc-contrib-guide/ux-ui-guidelines
 
 # Redirect any deploy guide project directory back to the current stable index
-{{ dir_to_page('/project-deploy-guide/(newton|ocata)', '/$1/deploy/') }}
-{{ path_to_released_series('/project-deploy-guide', '/deploy/') }}
+{{ dir_to_page('/project-deploy-guide/(newton|ocata|pike)', '/$1/deploy/') }}
+{{ path_to_released_series('/project-deploy-guide/?$', '/deploy/') }}
 
 # Redirect old install guide list pages to their new home
 {{ path_to_page('/(havana|icehouse|juno|kilo|mitaka)/install-guide', '/$1/') }}
diff --git a/www/project-data/pike.yaml b/www/project-data/pike.yaml
index 2d5a0e77ee..9d85750e0a 100644
--- a/www/project-data/pike.yaml
+++ b/www/project-data/pike.yaml
@@ -739,12 +739,10 @@
 - name: openstack-ansible
   service: OpenStack-Ansible Deployment
   type: deployment
-  has_deployment_guide: true
 
 - name: kolla-ansible
   service: Kolla Deployment
   type: deployment
-  has_deployment_guide: true
 
 # - name: os-win
 #   service: Windows / Hyper-V library for OpenStack projects.
diff --git a/www/redirect-tests.txt b/www/redirect-tests.txt
index 722da116a5..2f94b3147e 100644
--- a/www/redirect-tests.txt
+++ b/www/redirect-tests.txt
@@ -154,6 +154,12 @@
 {{ dir_to_page('/project-deploy-guide', '/' + RELEASED_SERIES + '/deploy/') }}
 {{ dir_to_page('/project-deploy-guide/newton', '/newton/deploy/') }}
 {{ dir_to_page('/project-deploy-guide/ocata', '/ocata/deploy/') }}
+/project-deploy-guide/openstack-ansible/pike/ 200
+/project-deploy-guide/openstack-ansible/ocata/ 200
+/project-deploy-guide/openstack-ansible/newton/ 200
+/project-deploy-guide/kolla-ansible/pike/ 200
+/project-deploy-guide/kolla-ansible/ocata/ 200
+
 
 # Redirect old install guide list pages to their new home
 {{ path_to_page('/havana/install-guide', '/havana/') }}