From fb0ba789299a973d4db02acfdc4e62e26c6e3e1a Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Thu, 18 Oct 2018 15:15:35 +0200
Subject: [PATCH] doc: restructure the image building documentation

Main goal: consolidate the information about image
building under the same documentation page, and move
plugin-specific details inside plugin pages.
No plugin-specific information should live outside
those pages.

More details:
- move the detailed documentation about sahara-image-pack
  from the contributor guide to the new dedicated page
  in the user manual;
- remove the vanilla and cdh pages which describes building
  images with sahara-image-create, and move the common
  information to new sahara-image-create page
  in the user manual;
- add the matrix of supported plugin versions and
  supported building technology for each plugin inside
  the respective <plugin>-plugin.rst;
- add the redirects for the removed pages (only for master
  and rocky, where this change should be backported).
- remove few details not really needed (e.g. how to convert
  to VMDK images, location of cloud-init packages, etc,
  which do not really belong here).

Change-Id: I8398a7ad625276d8f11d743688ba71902a7e1adc
---
 doc/source/user/mapr-plugin.rst | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/doc/source/user/mapr-plugin.rst b/doc/source/user/mapr-plugin.rst
index 681e25e..d1015fa 100644
--- a/doc/source/user/mapr-plugin.rst
+++ b/doc/source/user/mapr-plugin.rst
@@ -30,12 +30,33 @@ spent in the provisioning cycle. In addition, provisioning large clusters will
 put a burden on the network as packages for all nodes need to be downloaded
 from the package repository.
 
-For more information about MapR images, refer to
-`<https://git.openstack.org/cgit/openstack/sahara-image-elements>`_.
 
-There are VM images provided for use with the MapR Plugin, that can also be
-built using the tools available in sahara-image-elements:
-https://s3-us-west-2.amazonaws.com/sahara-images/index.html
+.. list-table:: Support matrix for the `mapr` plugin
+   :widths: 15 15 20 15 35
+   :header-rows: 1
+
+   * - Version
+       (image tag)
+     - Distribution
+     - Build method
+     - Version
+       (build parameter)
+     - Notes
+
+   * - 5.2.0.mrv2
+     - Ubuntu 14.04, CentOS 7
+     - sahara-image-pack
+     - 5.2.0.mrv2
+     -
+
+   * - 5.2.0.mrv2
+     - Ubuntu 14.04, CentOS 7
+     - sahara-image-create
+     - 5.2.0
+     -
+
+For more information about building image, refer to
+:doc:`building-guest-images`.
 
 MapR plugin needs an image to be tagged in Sahara Image Registry with
 two tags: 'mapr' and '<MapR version>' (e.g. '5.2.0.mrv2').