summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan <kaihongd@cn.ibm.com>2016-01-04 05:00:12 -0500
committerAlan <kaihongd@cn.ibm.com>2016-01-04 11:19:03 +0000
commite64c1943f1d9fe0f8e7042c55d954fc63473ca1f (patch)
tree20a5207ada8a6f5ebb424682c394d077c0d8d021
parentc540b9a82fed4cebbe9f41fcecd822ee6801c6a8 (diff)
downloadheat-e64c1943f1d9fe0f8e7042c55d954fc63473ca1f.tar.gz
Fix grammatical mistake, Changed character from "an" to "a" in below files:
models.py line 120:Represents an syncpoint domain.py line 27:is an realm with an identification string queue.py line 81:if an queue with the same test_resource_type.py line 65:Check for an known resource test_server.py line 444, 472, 499, 1169, 1300, 1335: create an server remote_client.py line 45:Returns an ssh connection install.sh line 22:Ubuntu has an lsb_release command Change-Id: Iab6fec86b9a3a9bef284bbc9069530313c570b39
-rw-r--r--heat/db/sqlalchemy/models.py2
-rw-r--r--heat/engine/resources/openstack/designate/domain.py2
-rw-r--r--heat/engine/resources/openstack/zaqar/queue.py2
-rw-r--r--heat/tests/engine/test_resource_type.py2
-rw-r--r--heat/tests/openstack/nova/test_server.py12
5 files changed, 10 insertions, 10 deletions
diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index 0a53e6572..88586e651 100644
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -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__ = (
diff --git a/heat/engine/resources/openstack/designate/domain.py b/heat/engine/resources/openstack/designate/domain.py
index 3832d5644..9bafa0745 100644
--- a/heat/engine/resources/openstack/designate/domain.py
+++ b/heat/engine/resources/openstack/designate/domain.py
@@ -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(
diff --git a/heat/engine/resources/openstack/zaqar/queue.py b/heat/engine/resources/openstack/zaqar/queue.py
index 07c4f8862..f135c0772 100644
--- a/heat/engine/resources/openstack/zaqar/queue.py
+++ b/heat/engine/resources/openstack/zaqar/queue.py
@@ -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.')
diff --git a/heat/tests/engine/test_resource_type.py b/heat/tests/engine/test_resource_type.py
index 13e124374..e65c51b72 100644
--- a/heat/tests/engine/test_resource_type.py
+++ b/heat/tests/engine/test_resource_type.py
@@ -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):
diff --git a/heat/tests/openstack/nova/test_server.py b/heat/tests/openstack/nova/test_server.py
index 0b62f8788..4640cd14c 100644
--- a/heat/tests/openstack/nova/test_server.py
+++ b/heat/tests/openstack/nova/test_server.py
@@ -441,7 +441,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',
@@ -469,7 +469,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',
@@ -496,7 +496,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',
@@ -1166,7 +1166,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']
@@ -1297,7 +1297,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}])
@@ -1332,7 +1332,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'}])