diff --git a/devstack/create_config b/devstack/create_config index 9679ddd7..a0d727f1 100755 --- a/devstack/create_config +++ b/devstack/create_config @@ -157,7 +157,7 @@ if [[ -n "$openstack_image_id" ]]; then fail=0 while [[ true ]] ; do if ((fail >= MAX_FAIL)); then - die $LINENO "Instance active status wait timeout occured" + die $LINENO "Instance active status wait timeout occurred" fi echo "attempt "$fail" of "$MAX_FAIL status=$(instance_status $instance_id) diff --git a/ec2api/tests/functional/base.py b/ec2api/tests/functional/base.py index 5db3bab9..37142c43 100644 --- a/ec2api/tests/functional/base.py +++ b/ec2api/tests/functional/base.py @@ -439,7 +439,7 @@ class EC2TestCase(base.BaseTestCase): try: waiter().wait_delete(obj_id) except botocore.exceptions.ClientError as e: - LOG.exception('Exception occured in cleanup waiting') + LOG.exception('Exception occurred in cleanup waiting') return False except botocore.exceptions.ClientError as e: error_code = e.response['Error']['Code'] @@ -780,7 +780,7 @@ class EC2TestCase(base.BaseTestCase): )['RouteTables'])) return True except Exception: - LOG.exception('Error occured during "delete_vpc_failed" hook') + LOG.exception('Error occurred during "delete_vpc_failed" hook') return False def assertEmpty(self, list_obj, msg=None):