openstack/heat
Code Issues Proposed changes

Merge "Fix grammatical mistake, Changed character from "an" to "a" in below files:"

Browse Source
This commit is contained in:
Jenkins 2016-01-17 12:10:18 +00:00 committed by Gerrit Code Review
commit 7e3e4087f4
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/db/sqlalchemy/models.py
View File

@ -117,7 +117,7 @@ class StackTag(BASE, HeatBase):
class SyncPoint(BASE, HeatBase):
"""Represents an syncpoint for a stack that is being worked on."""
"""Represents a syncpoint for a stack that is being worked on."""
__tablename__ = 'sync_point'
__table_args__ = (

2
heat/engine/resources/openstack/designate/domain.py
View File

@ -24,7 +24,7 @@ class DesignateDomain(resource.Resource):
"""Heat Template Resource for Designate Domain.
Designate provides DNS-as-a-Service services for OpenStack. So, domain
is an realm with an identification string, unique in DNS.
is a realm with an identification string, unique in DNS.
"""
support_status = support.SupportStatus(

2
heat/engine/resources/openstack/zaqar/queue.py
View File

@ -78,7 +78,7 @@ class ZaqarQueue(resource.Resource):
"""Create a zaqar message queue."""
queue_name = self.physical_resource_name()
queue = self.client().queue(queue_name, auto_create=False)
# Zaqar client doesn't report an error if an queue with the same
# Zaqar client doesn't report an error if a queue with the same
# id/name already exists, which can cause issue with stack update.
if queue.exists():
raise exception.Error(_('Message queue %s already exists.')

2
heat/tests/engine/test_resource_type.py
View File

@ -62,7 +62,7 @@ class ResourceTypeTest(common.HeatTestCase):
mock_is_service_available):
mock_is_service_available.return_value = False
resources = self.eng.list_resource_types(self.ctx)
# Check for an known resource, not listed
# Check for a known resource, not listed
self.assertNotIn('OS::Nova::Server', resources)
def test_resource_schema(self):

12
heat/tests/openstack/nova/test_server.py
View File

@ -458,7 +458,7 @@ class ServersTest(common.HeatTestCase):
stack_name = 'img_name_err'
(tmpl, stack) = self._setup_test_stack(stack_name)
# create an server with non exist image name
# create a server with non exist image name
tmpl['Resources']['WebServer']['Properties']['image'] = 'Slackware'
resource_defns = tmpl.resource_definitions(stack)
server = servers.Server('WebServer',
@ -486,7 +486,7 @@ class ServersTest(common.HeatTestCase):
stack_name = 'img_dup_err'
(tmpl, stack) = self._setup_test_stack(stack_name)
# create an server with a non unique image name
# create a server with a non unique image name
tmpl['Resources']['WebServer']['Properties']['image'] = 'CentOS 5.2'
resource_defns = tmpl.resource_definitions(stack)
server = servers.Server('WebServer',
@ -513,7 +513,7 @@ class ServersTest(common.HeatTestCase):
stack_name = 'img_id_err'
(tmpl, stack) = self._setup_test_stack(stack_name)
# create an server with non exist image Id
# create a server with non exist image Id
tmpl['Resources']['WebServer']['Properties']['image'] = '1'
resource_defns = tmpl.resource_definitions(stack)
server = servers.Server('WebServer',
@ -1183,7 +1183,7 @@ class ServersTest(common.HeatTestCase):
stack_name = 'srv_val_bootvol'
(tmpl, stack) = self._setup_test_stack(stack_name)
# create an server with bootable volume
# create a server with bootable volume
web_server = tmpl.t['Resources']['WebServer']
del web_server['Properties']['image']
@ -1314,7 +1314,7 @@ class ServersTest(common.HeatTestCase):
(tmpl, stack) = self._setup_test_stack(stack_name)
network_name = 'public'
# create an server with 'uuid' and 'network' properties
# create a server with 'uuid' and 'network' properties
tmpl['Resources']['WebServer']['Properties']['networks'] = (
[{'uuid': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa',
'network': network_name}])
@ -1349,7 +1349,7 @@ class ServersTest(common.HeatTestCase):
def test_server_validate_with_only_fixed_ip(self):
stack_name = 'srv_net'
(tmpl, stack) = self._setup_test_stack(stack_name)
# create an server with 'uuid' and 'network' properties
# create a server with 'uuid' and 'network' properties
tmpl['Resources']['WebServer']['Properties']['networks'] = (
[{'fixed_ip': '10.0.0.99'}])