openstack
/
sahara
Code Issues Proposed changes

Merge "Spark doc references vanilla diskimagebuilder page"

This commit is contained in:
Jenkins 2015-06-23 14:01:53 +00:00 committed by Gerrit Code Review
parent ab487a3f8e abffc5d1c5
commit f4608385f6
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/userdoc/guest-requirements.rst
View File

@ -30,7 +30,7 @@ To support EDP, the following components must also be installed on the guest:
* mysql
* hive
See :doc:`diskimagebuilder` for instructions on building images for this plugin.
See :doc:`vanilla_imagebuilder` for instructions on building images for this plugin.
HDP Plugin
----------

5
doc/source/userdoc/spark_plugin.rst
View File

@ -10,7 +10,10 @@ Images
------
For cluster provisioning prepared images should be used. The Spark plugin
has been developed and tested with the images generated by the :doc:`diskimagebuilder`.
has been developed and tested with the images generated by sahara-image-elements:
* https://github.com/openstack/sahara-image-elements
Those Ubuntu images already have Cloudera CDH4 HDFS and Apache Spark installed.
A prepared image can be found at the following location:

0
doc/source/userdoc/diskimagebuilder.rst → doc/source/userdoc/vanilla_imagebuilder.rst
View File

2
doc/source/userdoc/vanilla_plugin.rst
View File

@ -7,7 +7,7 @@ a cluster with Apache Hadoop.
For cluster provisioning prepared images should be used. They already have
Apache Hadoop 1.2.1 and Apache Hadoop 2.6.0 installed.
You may build images by yourself using :doc:`diskimagebuilder` or you could
You may build images by yourself using :doc:`vanilla_imagebuilder` or you could
download prepared images from http://sahara-files.mirantis.com/images/upstream/kilo/
Keep in mind that if you want to use the Swift Integration feature