Updated architecture diagram in docs

* Sahara component now is colored like others integrated components * Removed Cluster Configuration Manager as unrelated part of Sahara * Added more services which Sahara can connect to (Heat, Cinder) * Replaced Deployment Engine with Vendor Plugins * Added EDP block * Updated appropriate bullet points Change-Id: I77a3a3fd92a0dc7ffa1eeb24a3cdeddd4c6c6798
savi-dev · Apr 22, 2014 · e681d11 · e681d11
1 parent e565c40
commit e681d11
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/doc/source/architecture.rst b/doc/source/architecture.rst
@@ -9,17 +9,17 @@ Architecture
 
 The Sahara architecture consists of several components:
 
-* Cluster Configuration Manager  - all the business logic resides here
-
-* Auth component - responsible for client authentication & authorization
+* Auth component - responsible for client authentication & authorization, communicates with Keystone
 
 * DAL - Data Access Layer, persists internal models in DB
 
-* VM Provisioning - component responsible for communication with Nova and Glance
+* Provisioning Engine - component responsible for communication with Nova, Heat, Cinder and Glance
 
-* Deployment Engine - pluggable mechanism responsible for deploying Hadoop on provisioned VMs;
+* Vendor Plugins - pluggable mechanism responsible for configuring and launching Hadoop on provisioned VMs;
   existing management solutions like Apache Ambari and Cloudera Management Console could be utilized for that matter
 
+* EDP - :doc:`../userdoc/edp` responsible for scheduling and managing Hadoop jobs on clusters provisioned by Sahara
+
 * REST API - exposes Sahara functionality via REST
 
 * Python Sahara Client - similar to other OpenStack components Sahara has its own python client

diff --git a/doc/source/images/sahara-architecture.png b/doc/source/images/sahara-architecture.png