From 274af35dddf661a1c13e90c7698d50367c407935 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Thu, 13 Sep 2018 23:05:20 +0200
Subject: [PATCH] doc: update distro information and cloud-init users

- centralize the information about the default cloud-init users
  for various distributions to point to the existing specialized
  page;
- remove all CentOS 6 and Ubuntu 12.04 (Precise) references, and
  do not refer to Ubuntu 14.04 for the vanilla plugin;
- add Ubuntu 16.04 (Xenial) details when needed;
- update the pointers to few packages.

Change-Id: I4654e6ec2821bcec5207f41b93c5d0f0633ba18c
---
 doc/source/user/vanilla-imagebuilder.rst |  7 +++----
 doc/source/user/vanilla-plugin.rst       | 16 ++--------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/doc/source/user/vanilla-imagebuilder.rst b/doc/source/user/vanilla-imagebuilder.rst
index 6cafb2f..cf609fd 100644
--- a/doc/source/user/vanilla-imagebuilder.rst
+++ b/doc/source/user/vanilla-imagebuilder.rst
@@ -21,10 +21,9 @@ Elements for building vanilla images are stored in the
 
    Sahara requires images with cloud-init package installed:
 
-   * `For Fedora <http://pkgs.fedoraproject.org/cgit/cloud-init.git/>`_
-   * `For Ubuntu 14 <http://packages.ubuntu.com/trusty/cloud-init>`_
-   * `For CentOS 6 <http://mirror.centos.org/centos/6/extras/x86_64/Packages/cloud-init-0.7.5-10.el6.centos.2.x86_64.rpm>`_
-   * `For CentOS 7 <http://mirror.centos.org/centos/7/extras/x86_64/Packages/cloud-init-0.7.5-10.el7.centos.1.x86_64.rpm>`_
+   * `For Ubuntu 16.04 <http://packages.ubuntu.com/xenial/cloud-init>`_
+   * `For CentOS 7 <http://mirror.centos.org/centos/7/os/x86_64/Packages/cloud-init-0.7.9-24.el7.centos.x86_64.rpm>`_
+   * `For Fedora <https://src.fedoraproject.org/rpms/cloud-init>`_
 
 To create vanilla images follow these steps:
 
diff --git a/doc/source/user/vanilla-plugin.rst b/doc/source/user/vanilla-plugin.rst
index f5710ba..967b500 100644
--- a/doc/source/user/vanilla-plugin.rst
+++ b/doc/source/user/vanilla-plugin.rst
@@ -15,20 +15,8 @@ You may build images by yourself using :doc:`vanilla-imagebuilder`.
 Vanilla plugin requires an image to be tagged in Sahara Image Registry with
 two tags: 'vanilla' and '<hadoop version>' (e.g. '2.7.1').
 
-The default username specified for these images is different
-for each distribution:
-
-+--------------+------------+
-| OS           | username   |
-+==============+============+
-| Ubuntu 14    | ubuntu     |
-+--------------+------------+
-| Fedora 20    | fedora     |
-+--------------+------------+
-| CentOS 6     | cloud-user |
-+--------------+------------+
-| CentOS 7     | centos     |
-+--------------+------------+
+The image requires a username. For more information, refer to the
+:doc:`registering-image` section.
 
 Cluster Validation
 ------------------