summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-04 07:15:36 +0000
committerGerrit Code Review <review@openstack.org>2019-01-04 07:15:36 +0000
commit7665ff44047fcc5df9fde749af6f38796ab36190 (patch)
treedc130149c7c21830ffb00de8e27b12420a7ce506
parent7f8f4bf5c957bde10498db10db7cbf42ff794218 (diff)
parent51a37a7aff71d7202d827f60d4ece9b0b955227f (diff)
Merge "Drop trycmd() from manila/utils.py"
-rw-r--r--manila/utils.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/manila/utils.py b/manila/utils.py
index 7513e2e..1a38a4a 100644
--- a/manila/utils.py
+++ b/manila/utils.py
@@ -96,13 +96,6 @@ def execute(*cmd, **kwargs):
96 return processutils.execute(*cmd, **kwargs) 96 return processutils.execute(*cmd, **kwargs)
97 97
98 98
99def trycmd(*args, **kwargs):
100 """Convenience wrapper around oslo's trycmd() function."""
101 if 'run_as_root' in kwargs and 'root_helper' not in kwargs:
102 kwargs['root_helper'] = _get_root_helper()
103 return processutils.trycmd(*args, **kwargs)
104
105
106class SSHPool(pools.Pool): 99class SSHPool(pools.Pool):
107 """A simple eventlet pool to hold ssh connections.""" 100 """A simple eventlet pool to hold ssh connections."""
108 101