A few cleanups and some comments. Nothing major.

Signed-off-by: Ian Main <imain@redhat.com>

diff --git a/bin/heat b/bin/heat
index b71856863cb41dcb3b89822f7d6801b3388ddd0f..6c90ee8af957e8a5bb4f7d14443a97eedde58a5a 100755 (executable)
--- a/bin/heat
+++ b/bin/heat
@@ -19,7 +19,8 @@
 """
 This is the administration program for heat. It is simply a command-line
 interface for adding, modifying, and retrieving information about the stacks
-belonging to a user.
+belonging to a user.  It is a convenience application that talks to the heat
+API server.
 """
 
 import functools
@@ -107,7 +108,7 @@ def stack_create(options, arguments):
         return FAILURE
 
     if options.parameters:
-        count=1
+        count = 1
         for p in options.parameters.split(';'):
             (n, v) = p.split('=')
             parameters['Parameters.member.%d.ParameterKey' % count] = n
@@ -144,7 +145,7 @@ def stack_update(options, arguments):
         parameters['TemplateUrl'] = options.template_url
 
     if options.parameters:
-        count=1
+        count = 1
         for p in options.parameters.split(';'):
             (n, v) = p.split('=')
             parameters['Parameters.member.%d.ParameterKey' % count] = n

diff --git a/bin/heat-api b/bin/heat-api
index 8917308c019481124e36d6100c88d7ba92afb25c..611b53b47413fa6311f943a1acefa0da259e013c 100755 (executable)
--- a/bin/heat-api
+++ b/bin/heat-api
@@ -19,7 +19,9 @@
 #    under the License.
 
 """
-Heat API Server
+Heat API Server.  This implements an approximation of the Amazon
+CloudFormations API and translates it into a native representation.  It then
+calls the heat-engine via REST to implement them.
 """
 
 import gettext

diff --git a/bin/heat-engine b/bin/heat-engine
index d162bf27e0187de9496fb41c1be30889c8b5faa1..df0176b595893caac32cf53a152bff9e99f34e9b 100755 (executable)
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -15,7 +15,9 @@
 #    under the License.
 
 """
-Heat Engine Server
+Heat Engine Server.  This does the work of actually implementing the API
+calls made by the user.  Normal communications is done via the heat API
+which then calls into this engine.
 """
 
 import gettext

diff --git a/heat/client.py b/heat/client.py
index fb5e521811f019fd341761cd4f1da92d72c098f8..d0cd6dc122ef3fffb3b2c632700869e63b859dcb 100644 (file)
--- a/heat/client.py
+++ b/heat/client.py
@@ -88,7 +88,7 @@ class V1Client(base_client.BaseClient):
         data = json.loads(res.read())
         return data
 
-Client = V1Client
+HeatClient = V1Client
 
 
 def get_client(host, port=None, username=None,
@@ -128,7 +128,7 @@ def get_client(host, port=None, username=None,
     use_ssl = (creds['auth_url'] is not None and
         creds['auth_url'].find('https') != -1)
 
-    client = Client
+    client = HeatClient
 
     return client(host=host,
                 port=port,