openstack/deb-sahara
Code Issues Proposed changes

Spark doc references vanilla diskimagebuilder page

Browse Source 
"The Spark plugin has been developed and tested with the images
generated by the _Building Images for Vanilla Plugin_." rename
diskimagebuilder to avoid misunderstanding

Change-Id: Idb01707aa5d1982413560961d3a08aa10fdc7aa0
Closes-bug: 1462133
This commit is contained in:
luhuichun 2015-06-16 10:57:20 +08:00
parent 853ce1187a
commit abffc5d1c5
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 * mysql
* hive * 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 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 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. Those Ubuntu images already have Cloudera CDH4 HDFS and Apache Spark installed.
A prepared image can be found at the following location: 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 For cluster provisioning prepared images should be used. They already have
Apache Hadoop 1.2.1 and Apache Hadoop 2.6.0 installed. 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/ 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 Keep in mind that if you want to use the Swift Integration feature