From c5baed4502794289de664057d9d16d2f183ff0cb Mon Sep 17 00:00:00 2001
From: Michael Ionkin <mionkin@mirantis.com>
Date: Wed, 14 Sep 2016 20:07:20 +0300
Subject: [PATCH] [DOC] update doc about vanilla image builder

Change-Id: Iec8141d574b23447ca5ead11796e9e0c464aae7d
---
 doc/source/userdoc/vanilla_imagebuilder.rst | 31 +++++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/doc/source/userdoc/vanilla_imagebuilder.rst b/doc/source/userdoc/vanilla_imagebuilder.rst
index ec18780f..17bc39d3 100644
--- a/doc/source/userdoc/vanilla_imagebuilder.rst
+++ b/doc/source/userdoc/vanilla_imagebuilder.rst
@@ -22,7 +22,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 <http://packages.ubuntu.com/precise/cloud-init>`_
+   * `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>`_
 
 To create vanilla images follow these steps:
 
@@ -40,6 +42,12 @@ To create vanilla images follow these steps:
 
       tox -e venv -- sahara-image-create -u
 
+   If you want to build Vanilla 2.7.1 image with centos 7 just execute:
+
+   .. sourcecode:: console
+
+      tox -e venv -- sahara-image-create -p vanilla -v 2.7.1 -i centos7
+
    Tox will create a virtualenv and install required python packages in it,
    clone the repositories "https://github.com/openstack/diskimage-builder" and
    "https://github.com/openstack/sahara-image-elements" and export necessary
@@ -50,25 +58,30 @@ To create vanilla images follow these steps:
         * ``OOZIE_DOWNLOAD_URL`` - download link for OOZIE (we have built
           Oozie libs here: ``http://sahara-files.mirantis.com/oozie-4.2.0-hadoop-2.7.1.tar.gz``)
         * ``SPARK_DOWNLOAD_URL`` - download link for Spark
-        * ``HIVE_VERSION`` - version of Hive to install (currently supports only 0.11.0)
+        * ``HIVE_VERSION`` - version of Hive to install
+          (currently supports only 0.11.0)
         * ``ubuntu_image_name``
         * ``fedora_image_name``
-        * ``DIB_IMAGE_SIZE`` - parameter that specifies a volume of hard disk of
-          instance. You need to specify it only for Fedora because Fedora doesn't use all available volume
+        * ``DIB_IMAGE_SIZE`` - parameter that specifies a volume of hard disk
+          of instance. You need to specify it only for Fedora because Fedora
+          doesn't use all available volume
         * ``DIB_COMMIT_ID`` - latest commit id of diskimage-builder project
-        * ``SAHARA_ELEMENTS_COMMIT_ID`` - latest commit id of sahara-image-elements project
+        * ``SAHARA_ELEMENTS_COMMIT_ID`` - latest commit id of
+          sahara-image-elements project
 
-   NOTE: If you don't want to use default values, you should set your values of parameters.
+   NOTE: If you don't want to use default values, you should set your values
+     of parameters.
 
    Then it will create required cloud images using image elements that install
-   all the necessary packages and configure them. You will find created images in
-   the parent directory.
+   all the necessary packages and configure them. You will find created images
+   in the parent directory.
 
 .. note::
 
     Disk Image Builder will generate QCOW2 images, used with the default
     OpenStack Qemu/KVM hypervisors. If your OpenStack uses a different
-    hypervisor, the generated image should be converted to an appropriate format.
+    hypervisor, the generated image should be converted to an appropriate
+    format.
 
     VMware Nova backend requires VMDK image format. You may use qemu-img
     utility to convert a QCOW2 image to VMDK.