diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh index 0228b9c5..eb002b24 100755 --- a/contrib/ci/post_test_hook.sh +++ b/contrib/ci/post_test_hook.sh @@ -74,7 +74,7 @@ elif [[ $NO_SHARE_SERVER_HANDLING_MODES -ge 1 ]]; then elif [[ $WITH_SHARE_SERVER_HANDLING_MODES -ge 1 ]]; then iniset $BASE/new/tempest/etc/tempest.conf share multitenancy_enabled True else - echo 'Should never get here. If get, then error occured.' + echo 'Should never get here. If get, then error occurred.' exit 1 fi diff --git a/manila/share/drivers/ganesha/utils.py b/manila/share/drivers/ganesha/utils.py index 5461d833..593b1c00 100644 --- a/manila/share/drivers/ganesha/utils.py +++ b/manila/share/drivers/ganesha/utils.py @@ -44,7 +44,7 @@ def walk(dct): class RootExecutor(object): - """Execute wrapper defaulting to root exection.""" + """Execute wrapper defaulting to root execution.""" def __init__(self, execute=utils.execute): self.execute = execute diff --git a/manila/share/drivers/service_instance.py b/manila/share/drivers/service_instance.py index 62b67944..28529c9b 100644 --- a/manila/share/drivers/service_instance.py +++ b/manila/share/drivers/service_instance.py @@ -365,7 +365,7 @@ class ServiceInstanceManager(object): self.compute_api.server_get(context, server_id) except exception.InstanceNotFound: LOG.debug("Service instance '%s' was deleted " - "succesfully.", server_id) + "successfully.", server_id) break time.sleep(2) else: @@ -556,7 +556,7 @@ class ServiceInstanceManager(object): def _check_server_availability(self, server): t = time.time() while time.time() - t < self.max_time_to_build_instance: - LOG.debug('Checking service VM availablity.') + LOG.debug('Checking service VM availability.') try: socket.socket().connect((server['ip'], 22)) LOG.debug('Service VM is available via SSH.') diff --git a/manila/utils.py b/manila/utils.py index f158d291..764b86b8 100644 --- a/manila/utils.py +++ b/manila/utils.py @@ -102,7 +102,7 @@ class SSHPool(pools.Pool): look_for_keys=look_for_keys, timeout=self.conn_timeout) # Paramiko by default sets the socket timeout to 0.1 seconds, - # ignoring what we set thru the sshclient. This doesn't help for + # ignoring what we set through the sshclient. This doesn't help for # keeping long lived connections. Hence we have to bypass it, by # overriding it after the transport is initialized. We are setting # the sockettimeout to None and setting a keepalive packet so that,