diff options
| author | John Eckersberg <jeckersb@redhat.com> | 2008-01-28 12:42:38 -0500 |
|---|---|---|
| committer | John Eckersberg <jeckersb@redhat.com> | 2008-01-28 12:42:38 -0500 |
| commit | 632d297f42d47825c91be9dccee3833793b44a06 (patch) | |
| tree | bf1b2bb52bd56e1d96ffb62d39771dc4653f0a6d | |
| parent | 01f39402027b84a3b46f9d7b9cec1dee8cf9d64d (diff) | |
| download | third_party-func-632d297f42d47825c91be9dccee3833793b44a06.tar.gz third_party-func-632d297f42d47825c91be9dccee3833793b44a06.tar.xz third_party-func-632d297f42d47825c91be9dccee3833793b44a06.zip | |
assume root user for ssh login
| -rw-r--r-- | func/minion/modules/netapp/common.py | 4 | ||||
| -rw-r--r-- | func/minion/modules/netapp/vol/__init__.py | 12 | ||||
| -rw-r--r-- | func/minion/modules/netapp/vol/clone.py | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/func/minion/modules/netapp/common.py b/func/minion/modules/netapp/common.py index b76dbf6..de35060 100644 --- a/func/minion/modules/netapp/common.py +++ b/func/minion/modules/netapp/common.py @@ -2,13 +2,13 @@ import re import subprocess SSH = '/usr/bin/ssh' - +SSH_USER = 'root' class GenericSSHError(Exception): pass class NetappCommandError(Exception): pass class NetappMissingParam(Exception): pass class NetappNotImplementedError(Exception): pass -def ssh(user, host, cmdargs, input=None): +def ssh(host, cmdargs, input=None, user=SSH_USER): cmdline = [SSH, "-o forwardagent=no", "%s@%s" % (user, host)] cmdline.extend(cmdargs) diff --git a/func/minion/modules/netapp/vol/__init__.py b/func/minion/modules/netapp/vol/__init__.py index b1ee2fe..84041ad 100644 --- a/func/minion/modules/netapp/vol/__init__.py +++ b/func/minion/modules/netapp/vol/__init__.py @@ -33,7 +33,7 @@ class Vol(func_module.FuncModule): cmd_opts = ['vol', 'create'] cmd_opts.extend([args['name'], args['aggr'], args['size']]) - output = ssh('root', filer, cmd_opts) + output = ssh(filer, cmd_opts) return check_output(regex, output) def destroy(self, filer, args): @@ -46,7 +46,7 @@ class Vol(func_module.FuncModule): cmd_opts = ['vol', 'destroy'] cmd_opts.extend([args['name']]) - output = ssh('root', filer, cmd_opts, 'y') + output = ssh(filer, cmd_opts, 'y') return check_output(regex, output) def offline(self, filer, args): @@ -59,7 +59,7 @@ class Vol(func_module.FuncModule): cmd_opts = ['vol', 'offline'] cmd_opts.extend([args['name']]) - output = ssh('root', filer, cmd_opts) + output = ssh(filer, cmd_opts) return check_output(regex, output) def online(self, filer, args): @@ -72,7 +72,7 @@ class Vol(func_module.FuncModule): cmd_opts = ['vol', 'online'] cmd_opts.extend([args['name']]) - output = ssh('root', filer, cmd_opts) + output = ssh(filer, cmd_opts) return check_output(regex, output) def status(self, filer, args): @@ -91,13 +91,13 @@ class Vol(func_module.FuncModule): cmd_opts = ['vol', 'size', args['name']] if len(args.keys()) == 1: - output = ssh('root', filer, cmd_opts) + output = ssh(filer, cmd_opts) check_output(stat_regex, output) return output.split()[-1][:-1] else: param_check(args, ['delta']) cmd_opts.append('%+d%s' % (int(args['delta'][:-1]), args['delta'][-1])) - output = ssh('root', filer, cmd_opts) + output = ssh(filer, cmd_opts) return check_output(resize_regex, output) def options(self, filer, args): diff --git a/func/minion/modules/netapp/vol/clone.py b/func/minion/modules/netapp/vol/clone.py index 82b6723..510c37d 100644 --- a/func/minion/modules/netapp/vol/clone.py +++ b/func/minion/modules/netapp/vol/clone.py @@ -34,7 +34,7 @@ class Clone(func_module.FuncModule): cmd_opts = ['vol', 'create'] cmd_opts.extend([args['name'], args['aggr'], args['size']]) - output = ssh('root', filer, cmd_opts) + output = ssh(filer, cmd_opts) return check_output(regex, output) def split(self, filer, args): |