Changed resp= to response_file= as per mpdehaan's request
This commit is contained in:
parent
c45b5ef038
commit
d1eb67d689
1 changed files with 8 additions and 8 deletions
|
@ -53,7 +53,7 @@ options:
|
||||||
proxy:
|
proxy:
|
||||||
description:
|
description:
|
||||||
- HTTP[s] proxy to be used if C(src) is a URL.
|
- HTTP[s] proxy to be used if C(src) is a URL.
|
||||||
resp:
|
response_file:
|
||||||
description:
|
description:
|
||||||
- Specifies the location of a response file to be used if package expects input on install.
|
- Specifies the location of a response file to be used if package expects input on install.
|
||||||
'''
|
'''
|
||||||
|
@ -66,7 +66,7 @@ EXAMPLES = '''
|
||||||
- svr4pkg: name=CSWpkgutil src=http://get.opencsw.org/now state=present
|
- svr4pkg: name=CSWpkgutil src=http://get.opencsw.org/now state=present
|
||||||
|
|
||||||
# Install a package with a response file
|
# Install a package with a response file
|
||||||
- svr4pkg: name=CSWggrep src=/tmp/third-party.pkg resp=/tmp/ggrep.response state=present
|
- svr4pkg: name=CSWggrep src=/tmp/third-party.pkg response_file=/tmp/ggrep.response state=present
|
||||||
|
|
||||||
# Ensure that a package is not installed.
|
# Ensure that a package is not installed.
|
||||||
- svr4pkg: name=SUNWgnome-sound-recorder state=absent
|
- svr4pkg: name=SUNWgnome-sound-recorder state=absent
|
||||||
|
@ -115,13 +115,13 @@ def run_command(module, cmd):
|
||||||
cmd[0] = module.get_bin_path(progname, True)
|
cmd[0] = module.get_bin_path(progname, True)
|
||||||
return module.run_command(cmd)
|
return module.run_command(cmd)
|
||||||
|
|
||||||
def package_install(module, name, src, proxy, resp):
|
def package_install(module, name, src, proxy, response_file):
|
||||||
adminfile = create_admin_file()
|
adminfile = create_admin_file()
|
||||||
cmd = [ 'pkgadd', '-na', adminfile, '-d', src ]
|
cmd = [ 'pkgadd', '-na', adminfile, '-d', src ]
|
||||||
if proxy is not None:
|
if proxy is not None:
|
||||||
cmd += [ '-x', proxy ]
|
cmd += [ '-x', proxy ]
|
||||||
if resp is not None:
|
if response_file is not None:
|
||||||
cmd += [ '-r', resp ]
|
cmd += [ '-r', response_file ]
|
||||||
cmd.append(name)
|
cmd.append(name)
|
||||||
(rc, out, err) = run_command(module, cmd)
|
(rc, out, err) = run_command(module, cmd)
|
||||||
os.unlink(adminfile)
|
os.unlink(adminfile)
|
||||||
|
@ -141,7 +141,7 @@ def main():
|
||||||
state = dict(required = True, choices=['present', 'absent']),
|
state = dict(required = True, choices=['present', 'absent']),
|
||||||
src = dict(default = None),
|
src = dict(default = None),
|
||||||
proxy = dict(default = None),
|
proxy = dict(default = None),
|
||||||
resp = dict(default = None)
|
response_file = dict(default = None)
|
||||||
),
|
),
|
||||||
supports_check_mode=True
|
supports_check_mode=True
|
||||||
)
|
)
|
||||||
|
@ -149,7 +149,7 @@ def main():
|
||||||
name = module.params['name']
|
name = module.params['name']
|
||||||
src = module.params['src']
|
src = module.params['src']
|
||||||
proxy = module.params['proxy']
|
proxy = module.params['proxy']
|
||||||
resp = module.params['resp']
|
response_file = module.params['response_file']
|
||||||
rc = None
|
rc = None
|
||||||
out = ''
|
out = ''
|
||||||
err = ''
|
err = ''
|
||||||
|
@ -164,7 +164,7 @@ def main():
|
||||||
if not package_installed(module, name):
|
if not package_installed(module, name):
|
||||||
if module.check_mode:
|
if module.check_mode:
|
||||||
module.exit_json(changed=True)
|
module.exit_json(changed=True)
|
||||||
(rc, out, err) = package_install(module, name, src, proxy, resp)
|
(rc, out, err) = package_install(module, name, src, proxy, response_file)
|
||||||
# Stdout is normally empty but for some packages can be
|
# Stdout is normally empty but for some packages can be
|
||||||
# very long and is not often useful
|
# very long and is not often useful
|
||||||
if len(out) > 75:
|
if len(out) > 75:
|
||||||
|
|
Loading…
Reference in a new issue