Merge "Fix indentation errors found by Pep8 1.4.6+"

heat/common/config.py

@@ -136,7 +136,8 @@ auth_password_opts = [
 clients_opts = [
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help=_('Type of endpoint in Identity service catalog to use '
+               help=_(
+                   'Type of endpoint in Identity service catalog to use '
                    'for communication with the OpenStack service.')),
     cfg.StrOpt('ca_file',
                help=_('Optional CA cert file to use in SSL connections')),

heat/common/heat_keystoneclient.py

@@ -258,7 +258,8 @@ class KeystoneClient(object):
                                        project=self.context.tenant_id)
         else:
             logger.error(_("Failed to add user %(user)s to role %(role)s, "
-                         "check role exists!") % {'user': username,
+                         "check role exists!") % {
+                             'user': username,
                              'role': self.conf.heat_stack_user_role})
 
         return user.id

heat/engine/resources/autoscaling.py

@@ -879,7 +879,8 @@ class ScalingPolicy(signal_responder.SignalResponder, CooldownMixin):
 
         logger.info(_('%(name)s Alarm, adjusting Group %(group)s with id '
                     '%(asgn_id)s by %(filter)s') % {
-                    'name': self.name, 'group': group.name, 'asgn_id': asgn_id,
+                        'name': self.name, 'group': group.name,
+                        'asgn_id': asgn_id,
                         'filter': self.properties[self.SCALING_ADJUSTMENT]})
         group.adjust(int(self.properties[self.SCALING_ADJUSTMENT]),
                      self.properties[self.ADJUSTMENT_TYPE])

heat/engine/resources/instance.py

@@ -81,7 +81,8 @@ class Restarter(signal_responder.SignalResponder):
         victim = self._find_resource(self.properties[self.INSTANCE_ID])
         if victim is None:
             logger.info(_('%(name)s Alarm, can not find instance '
-                        '%(instance)s') % {'name': self.name,
+                        '%(instance)s') % {
+                            'name': self.name,
                             'instance': self.properties[self.INSTANCE_ID]})
             return
 

heat/engine/resources/user.py

@@ -89,7 +89,8 @@ class User(resource.Resource):
             except KeyError:
                 logger.error(_("Policy %(policy)s does not exist in stack "
                              "%(stack)s") % {
-                             'policy': policy, 'stack': self.stack.name})
+                                 'policy': policy,
+                                 'stack': self.stack.name})
                 return False
 
             if not callable(getattr(policy_rsrc, 'access_allowed', None)):
@@ -279,10 +280,10 @@ class AccessKey(resource.Resource):
                         db_api.resource_data_set(self, 'credential_id',
                                                  kp.id, redact=True)
                     except Exception as ex:
-                        logger.warn(_('could not get secret for %(username)s '
+                        logger.warn(
+                            _('could not get secret for %(username)s '
                               'Error:%(msg)s') % {
-                                    'username':
-                                    self.properties[self.USER_NAME],
+                                  'username': self.properties[self.USER_NAME],
                                   'msg': str(ex)})
 
         return self._secret or '000-000-000'

heat/tests/test_neutron_loadbalancer.py

@@ -447,7 +447,8 @@ class PoolTest(HeatTestCase):
                 'protocol': u'HTTP', 'name': 'pool.vip',
                 'admin_state_up': True, 'subnet_id': u'sub123',
                 'pool_id': '5678', 'protocol_port': 80,
-                'session_persistence': {'type': 'APP_COOKIE',
+                'session_persistence': {
+                    'type': 'APP_COOKIE',
                     'cookie_name': 'cookie'}}}
         ).AndReturn({'vip': {'id': 'xyz'}})
         neutronclient.Client.show_pool('5678').AndReturn(