openstack
/
sahara-plugin-vanilla
Code Issues Proposed changes

Incorrect indent Sahara Installation Guide in sahara 

Incorrect indent Sahara Installation Guide in sahara cause wrong
front format.
Closes-Bug:#1729530
Change-Id: I419cd7dbcf9d7f7dadda5d4c7ebf75af64ef2081
This commit is contained in:
Guo Shan 2017-11-02 16:56:33 +08:00 committed by Shan Guo
parent f2927deb66
commit 567a8dacb6
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
doc/source/user/vanilla-imagebuilder.rst
View File

@ -53,24 +53,24 @@ To create vanilla images follow these steps:
"https://git.openstack.org/cgit/openstack/sahara-image-elements" and export necessary "https://git.openstack.org/cgit/openstack/sahara-image-elements" and export necessary
parameters. parameters.
* ``DIB_HADOOP_VERSION`` - version of Hadoop to install * ``DIB_HADOOP_VERSION`` - version of Hadoop to install
* ``JAVA_DOWNLOAD_URL`` - download link for JDK (tarball or bin) * ``JAVA_DOWNLOAD_URL`` - download link for JDK (tarball or bin)
* ``OOZIE_DOWNLOAD_URL`` - download link for OOZIE (we have built * ``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``) 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 * ``SPARK_DOWNLOAD_URL`` - download link for Spark
* ``HIVE_VERSION`` - version of Hive to install * ``HIVE_VERSION`` - version of Hive to install
(currently supports only 0.11.0) (currently supports only 0.11.0)
* ``ubuntu_image_name`` * ``ubuntu_image_name``
* ``fedora_image_name`` * ``fedora_image_name``
* ``DIB_IMAGE_SIZE`` - parameter that specifies a volume of hard disk * ``DIB_IMAGE_SIZE`` - parameter that specifies a volume of hard disk
of instance. You need to specify it only for Fedora because Fedora of instance. You need to specify it only for Fedora because Fedora
doesn't use all available volume doesn't use all available volume
* ``DIB_COMMIT_ID`` - latest commit id of diskimage-builder project * ``DIB_COMMIT_ID`` - latest commit id of diskimage-builder project
* ``SAHARA_ELEMENTS_COMMIT_ID`` - latest commit id of * ``SAHARA_ELEMENTS_COMMIT_ID`` - latest commit id of
sahara-image-elements project sahara-image-elements project
NOTE: If you don't want to use default values, you should set your values NOTE: If you don't want to use default values, you should set your values
of parameters. of parameters.
Then it will create required cloud images using image elements that install Then it will create required cloud images using image elements that install
all the necessary packages and configure them. You will find created images all the necessary packages and configure them. You will find created images

24
doc/source/user/vanilla-plugin.rst
View File

@ -42,15 +42,15 @@ plugin:
For Vanilla Hadoop version 2.x.x: For Vanilla Hadoop version 2.x.x:
+ Cluster must contain exactly one namenode + Cluster must contain exactly one namenode
+ Cluster can contain at most one resourcemanager + Cluster can contain at most one resourcemanager
+ Cluster can contain at most one secondary namenode + Cluster can contain at most one secondary namenode
+ Cluster can contain at most one historyserver + Cluster can contain at most one historyserver
+ Cluster can contain at most one oozie and this process is also required + Cluster can contain at most one oozie and this process is also required
for EDP for EDP
+ Cluster can't contain oozie without resourcemanager and without + Cluster can't contain oozie without resourcemanager and without
historyserver historyserver
+ Cluster can't have nodemanager nodes if it doesn't have resourcemanager + Cluster can't have nodemanager nodes if it doesn't have resourcemanager
+ Cluster can have at most one hiveserver node. + Cluster can have at most one hiveserver node.
+ Cluster can have at most one spark history server and this process is also + Cluster can have at most one spark history server and this process is also
required for Spark EDP (Spark is available since the Newton release). required for Spark EDP (Spark is available since the Newton release).