diff --git a/bin/heat-keystone-setup b/bin/heat-keystone-setup index 9a8180b1e..c2fd3bbd1 100755 --- a/bin/heat-keystone-setup +++ b/bin/heat-keystone-setup @@ -122,7 +122,7 @@ get_column_num() { get_user() { local username=$1 - # Outut format of keystone user-list changed between essex and + # Output format of keystone user-list changed between essex and # folsom - the columns have been re-ordered (!?), so detect what # column to pass to get_data via get_column_num namecol=$(get_column_num name keystone user-list) diff --git a/doc/source/getting_started/on_devstack.rst b/doc/source/getting_started/on_devstack.rst index 57939f551..ef37cf7d6 100644 --- a/doc/source/getting_started/on_devstack.rst +++ b/doc/source/getting_started/on_devstack.rst @@ -61,7 +61,7 @@ Preparing Nova for running stacks --------------------------------- Enabling Heat in devstack will replace the default Nova flavors with -flavours that the Heat example templates expect. You can see what +flavors that the Heat example templates expect. You can see what those flavors are by running:: nova flavor-list diff --git a/doc/source/template_guide/contrib.rst b/doc/source/template_guide/contrib.rst index 1d90ecf56..575b24d8f 100644 --- a/doc/source/template_guide/contrib.rst +++ b/doc/source/template_guide/contrib.rst @@ -52,7 +52,7 @@ Nova Flavor Resource .. rubric:: This resource is not enabled by default. -This plugin enables dynamic creation of Nova flavours through Heat. You can +This plugin enables dynamic creation of Nova flavors through Heat. You can find more information in the `README `_. diff --git a/heat/engine/resources/server.py b/heat/engine/resources/server.py index c1acac5ac..75cc424b6 100644 --- a/heat/engine/resources/server.py +++ b/heat/engine/resources/server.py @@ -521,7 +521,7 @@ class Server(stack_user.StackUser): files=personality_files, admin_pass=admin_pass) finally: - # Avoid a race condition where the thread could be cancelled + # Avoid a race condition where the thread could be canceled # before the ID is stored if server is not None: self.resource_id_set(server.id) diff --git a/heat/engine/resources/software_config/multi_part.py b/heat/engine/resources/software_config/multi_part.py index 415993b50..270e94e40 100644 --- a/heat/engine/resources/software_config/multi_part.py +++ b/heat/engine/resources/software_config/multi_part.py @@ -57,7 +57,7 @@ class MultipartMime(software_config.SoftwareConfig): properties_schema = { PARTS: properties.Schema( properties.Schema.LIST, - _('Parts belonging to this messsage.'), + _('Parts belonging to this message.'), default=[], schema=properties.Schema( properties.Schema.MAP, diff --git a/heat/engine/resources/volume.py b/heat/engine/resources/volume.py index 0136ed4aa..7fdcfcbf7 100644 --- a/heat/engine/resources/volume.py +++ b/heat/engine/resources/volume.py @@ -648,7 +648,7 @@ class CinderVolume(Volume): elif new_size > vol.size: if vol.attachments: # NOTE(pshchelo): - # this relies on current behaviour of cinder attachments, + # this relies on current behavior of cinder attachments, # i.e. volume attachments is a list with len<=1, # so the volume can be attached only to single instance, # and id of attachment is the same as id of the volume diff --git a/heat/engine/service.py b/heat/engine/service.py index 9b3a81283..f0f8dd040 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -357,7 +357,7 @@ class EngineService(service.Service): # Wait for all active threads to be finished for stack_id in self.thread_group_mgr.groups.keys(): - # Ingore dummy service task + # Ignore dummy service task if stack_id == cfg.CONF.periodic_interval: continue LOG.info(_("Waiting stack %s processing to be finished") @@ -668,7 +668,7 @@ class EngineService(service.Service): if ResourceClass == resources.template_resource.TemplateResource: # we can't validate a TemplateResource unless we instantiate # it as we need to download the template and convert the - # paramerters into properties_schema. + # parameters into properties_schema. continue props = properties.Properties(ResourceClass.properties_schema, @@ -901,7 +901,7 @@ class EngineService(service.Service): - The user must map to a User resource defined in the requested stack - The user resource must validate OK against any Policy specified ''' - # first check whether access is allowd by context user_id + # first check whether access is allowed by context user_id if stack.access_allowed(cnxt.user_id, resource_name): return True diff --git a/heat/engine/signal_responder.py b/heat/engine/signal_responder.py index 830c965c8..f46bfff8c 100644 --- a/heat/engine/signal_responder.py +++ b/heat/engine/signal_responder.py @@ -76,7 +76,7 @@ class SignalResponder(stack_user.StackUser): path = self.identifier().arn_url_path() # Note the WSGI spec apparently means that the webob request we end up - # prcessing in the CFN API (ec2token.py) has an unquoted path, so we + # processing in the CFN API (ec2token.py) has an unquoted path, so we # need to calculate the signature with the path component unquoted, but # ensure the actual URL contains the quoted version... unquoted_path = urlparse.unquote(host_url.path + path) diff --git a/heat/tests/test_api_aws.py b/heat/tests/test_api_aws.py index 1549d9cea..586e29b61 100644 --- a/heat/tests/test_api_aws.py +++ b/heat/tests/test_api_aws.py @@ -18,7 +18,7 @@ from heat.tests.common import HeatTestCase class AWSCommonTest(HeatTestCase): ''' - Tests the api/aws common componenents + Tests the api/aws common components ''' # The tests def test_format_response(self):