diff --git a/contrib/rackspace/rackspace/resources/cloud_server.py b/contrib/rackspace/rackspace/resources/cloud_server.py index c59f6468c9..50d134323d 100644 --- a/contrib/rackspace/rackspace/resources/cloud_server.py +++ b/contrib/rackspace/rackspace/resources/cloud_server.py @@ -101,7 +101,7 @@ class CloudServer(server.Server): _('How the server should receive the metadata required for ' 'software configuration. POLL_TEMP_URL is the only ' 'supported transport on Rackspace Cloud. This property is ' - 'retained for compatability.'), + 'retained for compatibility.'), default=server.Server.POLL_TEMP_URL, update_allowed=True, constraints=[ diff --git a/contrib/rackspace/rackspace/tests/test_auto_scale.py b/contrib/rackspace/rackspace/tests/test_auto_scale.py index 8a709cb73e..44ce5d8029 100644 --- a/contrib/rackspace/rackspace/tests/test_auto_scale.py +++ b/contrib/rackspace/rackspace/tests/test_auto_scale.py @@ -267,7 +267,7 @@ class ScalingGroupTest(common.HeatTestCase): self.fake_auto_scale = FakeAutoScale() self.patchobject(auto_scale.Group, 'auto_scale', return_value=self.fake_auto_scale) - # mock nova and glance client methods to satisfy contraints + # mock nova and glance client methods to satisfy constraints mock_im = self.patchobject(glance.GlanceClientPlugin, 'find_image_by_name_or_id') mock_im.return_value = 'image-ref' diff --git a/heat/common/exception.py b/heat/common/exception.py index 7397645ae9..c29295888a 100644 --- a/heat/common/exception.py +++ b/heat/common/exception.py @@ -255,7 +255,7 @@ class ClientNotAvailable(HeatException): class WatchRuleNotFound(EntityNotFound): - """Keep this for AWS compatiblility.""" + """Keep this for AWS compatibility.""" msg_fmt = _("The Watch Rule (%(watch_name)s) could not be found.") diff --git a/heat/engine/resources/openstack/ceilometer/alarm.py b/heat/engine/resources/openstack/ceilometer/alarm.py index c900ffd4d1..f75b3fdbb5 100644 --- a/heat/engine/resources/openstack/ceilometer/alarm.py +++ b/heat/engine/resources/openstack/ceilometer/alarm.py @@ -346,7 +346,7 @@ class CeilometerAlarm(resource.Resource): self.resource_id_set(alarm.alarm_id) # the watchrule below is for backwards compatibility. - # 1) so we don't create watch tasks unneccessarly + # 1) so we don't create watch tasks unnecessarily # 2) to support CW stats post, we will redirect the request # to ceilometer. wr = watchrule.WatchRule(context=self.context, diff --git a/heat/engine/resources/openstack/neutron/vpnservice.py b/heat/engine/resources/openstack/neutron/vpnservice.py index 6ab7deb0a7..b93f76a595 100644 --- a/heat/engine/resources/openstack/neutron/vpnservice.py +++ b/heat/engine/resources/openstack/neutron/vpnservice.py @@ -459,7 +459,7 @@ class IPsecSiteConnection(neutron.NeutronResource): class IKEPolicy(neutron.NeutronResource): """A resource for IKE policy in Neutron. - The Internet Key Exchange policy identifyies the authentication and + The Internet Key Exchange policy identifies the authentication and encryption algorithm used during phase one and phase two negotiation of a VPN connection. """ diff --git a/heat/engine/resources/openstack/nova/server.py b/heat/engine/resources/openstack/nova/server.py index 6edad44ef5..0183c6bb78 100644 --- a/heat/engine/resources/openstack/nova/server.py +++ b/heat/engine/resources/openstack/nova/server.py @@ -469,7 +469,7 @@ class Server(stack_user.StackUser, sh.SchedulerHintsMixin, USER_DATA_UPDATE_POLICY: properties.Schema( properties.Schema.STRING, _('Policy on how to apply a user_data update; either by ' - 'ignorning it or by replacing the entire server.'), + 'ignoring it or by replacing the entire server.'), default='REPLACE', constraints=[ constraints.AllowedValues(['REPLACE', 'IGNORE']), @@ -1423,7 +1423,7 @@ class Server(stack_user.StackUser, sh.SchedulerHintsMixin, if metadata is not None or personality: limits = self.client_plugin().absolute_limits() - # if 'security_groups' present for the server and explict 'port' + # if 'security_groups' present for the server and explicit 'port' # in one or more entries in 'networks', raise validation error if networks_with_port and self.properties[self.SECURITY_GROUPS]: raise exception.ResourcePropertyConflict( diff --git a/heat/engine/service.py b/heat/engine/service.py index 2880ab051c..1d8dbe8c1e 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -179,7 +179,7 @@ class ThreadGroupManager(object): """Callback function that will be passed to GreenThread.link(). Persist the stack state to COMPLETE and FAILED close to - releasing the lock to avoid race condtitions. + releasing the lock to avoid race conditions. """ if stack is not None and stack.action not in ( stack.DELETE, stack.ROLLBACK, stack.UPDATE): diff --git a/heat/engine/stack.py b/heat/engine/stack.py index 37e15565c3..fd012528cc 100644 --- a/heat/engine/stack.py +++ b/heat/engine/stack.py @@ -1255,7 +1255,7 @@ class Stack(collections.Mapping): if stack_id is None: # Failed concurrent update LOG.warning(_LW("Failed to store stack %(name)s with traversal" - " ID %(trvsl_id)s, not trigerring rollback."), + " ID %(trvsl_id)s, not triggering rollback."), {'name': self.name, 'trvsl_id': self.current_traversal}) return diff --git a/heat/engine/sync_point.py b/heat/engine/sync_point.py index 1f3595feaa..56f08d614c 100644 --- a/heat/engine/sync_point.py +++ b/heat/engine/sync_point.py @@ -131,7 +131,7 @@ def sync(cnxt, entity_id, current_traversal, is_update, propagate, rows_updated = update_input_data( cnxt, entity_id, current_traversal, is_update, sync_point.atomic_key, serialize_input_data(input_data)) - # don't aggresively spin; induce some sleep + # don't aggressively spin; induce some sleep if not rows_updated: eventlet.sleep(random.uniform(0, max_wt)) diff --git a/heat/tests/openstack/heat/test_software_deployment.py b/heat/tests/openstack/heat/test_software_deployment.py index f5ba33febd..56361c2266 100644 --- a/heat/tests/openstack/heat/test_software_deployment.py +++ b/heat/tests/openstack/heat/test_software_deployment.py @@ -886,7 +886,7 @@ class SoftwareDeploymentTest(common.HeatTestCase): self.assertEqual(details, ca[2]) self.assertIsNotNone(ca[3]) - # Test bug 1332355, where details contains a translateable message + # Test bug 1332355, where details contains a translatable message details = {'failed': _('need more memory.')} ret = self.deployment.handle_signal(details) self.assertEqual('deployment failed', ret) diff --git a/heat/tests/test_environment.py b/heat/tests/test_environment.py index 94896faff3..4bfe7519c0 100644 --- a/heat/tests/test_environment.py +++ b/heat/tests/test_environment.py @@ -593,7 +593,7 @@ class ChildEnvTest(common.HeatTestCase): rr = cenv.user_env_as_dict()['resource_registry'] self.assertIn('OS::Food', rr) self.assertNotIn('OS::Food', rr['resources']['abc']) - # make sure the parent env is uneffected + # make sure the parent env is unaffected innocent2 = penv.get_resource_info('OS::Food', resource_name='abc') self.assertEqual(['resources', 'abc', 'OS::Food'], innocent2.path) diff --git a/heat_integrationtests/functional/test_resource_group.py b/heat_integrationtests/functional/test_resource_group.py index 1e9edd50ac..f1ae923c9b 100644 --- a/heat_integrationtests/functional/test_resource_group.py +++ b/heat_integrationtests/functional/test_resource_group.py @@ -48,7 +48,7 @@ outputs: def test_resource_group_zero_novalidate(self): # Nested resources should be validated only when size > 0 # This allows features to be disabled via size=0 without - # triggering validation of nested resource custom contraints + # triggering validation of nested resource custom constraints # e.g images etc in the nested schema. nested_template_fail = ''' heat_template_version: 2013-05-23