More peppy fixes...

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/cfntools/cfn_helper.py b/heat/cfntools/cfn_helper.py
index b35287adef3fe03581caf9655d79a459e679e7cc..4ff7745cdd853dc5dc22254fc3d718ace9987198 100644 (file)
--- a/heat/cfntools/cfn_helper.py
+++ b/heat/cfntools/cfn_helper.py
@@ -44,6 +44,7 @@ import sys
 from urllib2 import urlopen
 from urlparse import urlparse, urlunparse
 
+
 def to_boolean(b):
     val = b.lower().strip() if isinstance(b, basestring) else b
     return val in [True, 'true', 'yes', '1', 1]
@@ -732,9 +733,11 @@ class ServicesHandler(object):
             else:
                 self._monitor_services(handler, service_entries)
 
+
 class MetadataServerConnectionError(Exception):
     pass
 
+
 class Metadata(object):
     _metadata = None
     _init_key = "AWS::CloudFormation::Init"
@@ -753,7 +756,6 @@ class Metadata(object):
         self._is_local_metadata = True
         self._metadata = None
 
-
     def metadata_server_url(self):
         """
         Return the url to the metadata server.

diff --git a/heat/common/config.py b/heat/common/config.py
index 0902a676845bba4843d4d91f4f89c79a17b3eeb4..dd8a74b5365f9653d362eb1a683a16b14ad79868 100644 (file)
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -139,6 +139,7 @@ class HeatConfigOpts(cfg.CommonConfigOpts):
             **kwargs)
         self.register_cli_opts(rpc_opts)
 
+
 class HeatMetadataConfigOpts(cfg.CommonConfigOpts):
     def __init__(self, default_config_files=None, **kwargs):
         config_files = cfg.find_config_files(project='heat',

diff --git a/heat/db/sqlalchemy/session.py b/heat/db/sqlalchemy/session.py
index b90cf0b74822816422859bdc479d7b79224c4d09..70988f6bf92e600adac329ac7d1c5be347bf2184 100644 (file)
--- a/heat/db/sqlalchemy/session.py
+++ b/heat/db/sqlalchemy/session.py
@@ -110,9 +110,10 @@ def get_engine():
 
 def get_maker(engine, autocommit=True, expire_on_commit=False):
     """Return a SQLAlchemy sessionmaker using the given engine."""
-    return sqlalchemy.orm.scoped_session(sqlalchemy.orm.sessionmaker(bind=engine,
+    ses = sqlalchemy.orm.sessionmaker(bind=engine,
                                        autocommit=autocommit,
-                                       expire_on_commit=expire_on_commit))
+                                       expire_on_commit=expire_on_commit)
+    return sqlalchemy.orm.scoped_session(ses)
 
 
 def _get_sql_connection():

diff --git a/heat/engine/instance.py b/heat/engine/instance.py
index 9a39c32d7e5ecde41b3002b0397e0aea112cbb34..2199744af7245399ecb7c373f569045214b21cba 100644 (file)
--- a/heat/engine/instance.py
+++ b/heat/engine/instance.py
@@ -116,7 +116,8 @@ class Instance(Resource):
                 mime_blob.attach(msg)
 
             msg = MIMEText(userdata, _subtype='x-shellscript')
-            msg.add_header('Content-Disposition', 'attachment', filename='startup')
+            msg.add_header('Content-Disposition', 'attachment',
+                           filename='startup')
             mime_blob.attach(msg)
             self.mime_string = mime_blob.as_string()
 

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index fa0e558b0944fc6be62a229cd97fc22e7d36ada8..da53f0979d95e1cf6b6e4c9a60cd384b7593aaaf 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -119,9 +119,10 @@ class Stack(object):
             try:
                 res = self.resources[r].validate()
                 if res:
+                    err_str = 'Malformed Query Response [%s]' % (res)
                     response = {'ValidateTemplateResult': {
-                           'Description': 'Malformed Query Response [%s]' % res,
-                           'Parameters': []}}
+                                'Description': err_str,
+                                'Parameters': []}}
                     return response
             except Exception as ex:
                 logger.exception('validate')

diff --git a/heat/metadata/api/v1/metadata.py b/heat/metadata/api/v1/metadata.py
index b0fe3edc760766872dc16a2d447d08f26758c210..9df424e90858d9487ebd991f08e00d4bb0a2054d 100644 (file)
--- a/heat/metadata/api/v1/metadata.py
+++ b/heat/metadata/api/v1/metadata.py
@@ -30,11 +30,13 @@ def json_response(http_status, data):
     response.content_type = 'application/json'
     return response
 
+
 def json_error(http_status, message):
     """Create a JSON error response."""
     body = {'error': message}
     return json_response(http_status, body)
 
+
 class MetadataController:
     def __init__(self, options):
         self.options = options
@@ -59,7 +61,8 @@ class MetadataController:
         if resources:
             return resources
         else:
-            return json_error(404, 'The stack "%s" does not exist.' % stack_name)
+            return json_error(404,
+                              'The stack "%s" does not exist.' % stack_name)
 
     def get_resource(self, req, stack_name, resource_id):
         con = context.get_admin_context()
@@ -69,9 +72,11 @@ class MetadataController:
                                                'resource_id': resource_id}})
         if error:
             if error == 'stack':
-                return json_error(404, 'The stack "%s" does not exist.' % stack_name)
+                return json_error(404,
+                                  'The stack "%s" does not exist.' % stack_name)
             else:
-                return json_error(404, 'The resource "%s" does not exist.' % resource_id)
+                return json_error(404,
+                                  'The resource "%s" does not exist.' % resource_id)
         return metadata
 
     def update_metadata(self, req, body, stack_name, resource_id):
@@ -83,14 +88,17 @@ class MetadataController:
                                                'metadata': body}})
         if error:
             if error == 'stack':
-                return json_error(404, 'The stack "%s" does not exist.' % stack_name)
+                return json_error(404,
+                                  'The stack "%s" does not exist.' % stack_name)
             else:
-                return json_error(404, 'The resource "%s" does not exist.' % resource_id)
+                return json_error(404,
+                                  'The resource "%s" does not exist.' % resource_id)
         return json_response(201, {
             'resource': resource_id,
             'metadata': body,
         })
 
+
 def create_resource(options):
     """
     Stacks resource factory method.
@@ -98,4 +106,3 @@ def create_resource(options):
     deserializer = wsgi.JSONRequestDeserializer()
     serializer = wsgi.JSONResponseSerializer()
     return wsgi.Resource(MetadataController(options), deserializer, serializer)
-