From 4c31ded0322af53e22a45d293b62fea6bb1ccb9d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Mon, 30 Oct 2017 13:40:31 +0000
Subject: [PATCH] Update Deploy guides publication

OpenStack-Ansible and Kolla already have published deploy
guides, but it seems like they are not in the index page.

Updating project data for those projects should be enough to
get them generated into the
``https://docs.openstack.org/pike/deploy/`` index.

On top of that, OpenStack-Ansible also have a Queens
documentation published under "latest", so I am also adding it
to the list of the deploy guides. The names of those
deploy tools is also edited to match the names of Pike
deploy guides.

Closes-Bug: #1727779
Change-Id: I59b73eb3f5afc7ef5cdb64252d558b57ea26abf2
---
 www/.htaccess                | 3 ++-
 www/project-data/latest.yaml | 7 +++----
 www/project-data/pike.yaml   | 2 ++
 www/redirect-tests.txt       | 5 +++++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/www/.htaccess b/www/.htaccess
index c014b288a5..ca588022df 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -139,8 +139,9 @@ redirect 301 /glossary/content/glossary.html /doc-contrib-guide/common/glossary.
 redirect 301 /doc-contrib-guide/ui-text-guidelines.html /doc-contrib-guide/ux-ui-guidelines/ui-text-guidelines.html
 redirect 301 /doc-contrib-guide/ui-text-guidelines /doc-contrib-guide/ux-ui-guidelines
 
+# Redirect deploy guides to their branch index.
+{{ dir_to_page('/project-deploy-guide/(newton|ocata|pike|queens)', '/$1/deploy/') }}
 # Redirect any deploy guide project directory back to the current stable index
-{{ 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
diff --git a/www/project-data/latest.yaml b/www/project-data/latest.yaml
index 4b00cdca9f..f9971a9422 100644
--- a/www/project-data/latest.yaml
+++ b/www/project-data/latest.yaml
@@ -841,14 +841,13 @@
   service: Deploying OpenStack using Juju Charms
 - name: kolla
   type: deployment
-  service: Deploying OpenStack using Ansible in Docker Containers (kolla)
+  service: Kolla Deployment
 - name: openstack-ansible
   type: deployment
-  service: Deploying OpenStack with Ansible
+  service: OpenStack-Ansible Deployment
   has_admin_guide: true
   has_user_guide: true
-  # NOTE(dhellmann): There is no guide at /project-deploy-guide/openstack-ansible/latest/index.html
-  # has_deployment_guide: true
+  has_deployment_guide: true
 - name: tripleo-docs
   type: deployment
   service: Deploying OpenStack with TripleO
diff --git a/www/project-data/pike.yaml b/www/project-data/pike.yaml
index 9d85750e0a..2d5a0e77ee 100644
--- a/www/project-data/pike.yaml
+++ b/www/project-data/pike.yaml
@@ -739,10 +739,12 @@
 - 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 2f94b3147e..e27f7be9a8 100644
--- a/www/redirect-tests.txt
+++ b/www/redirect-tests.txt
@@ -152,8 +152,13 @@
 
 # Redirect any deploy guide project directory back to the current stable index
 {{ dir_to_page('/project-deploy-guide', '/' + RELEASED_SERIES + '/deploy/') }}
+# Redirect all the project deploy folders to their appropriate branch
 {{ dir_to_page('/project-deploy-guide/newton', '/newton/deploy/') }}
 {{ dir_to_page('/project-deploy-guide/ocata', '/ocata/deploy/') }}
+{{ dir_to_page('/project-deploy-guide/pike', '/pike/deploy/') }}
+{{ dir_to_page('/project-deploy-guide/queens', '/queens/deploy/') }}
+# Ensure each project's deloy guide is reachable.
+/project-deploy-guide/openstack-ansible/latest/ 200
 /project-deploy-guide/openstack-ansible/pike/ 200
 /project-deploy-guide/openstack-ansible/ocata/ 200
 /project-deploy-guide/openstack-ansible/newton/ 200