Set some module parameters to type=path

This commit is contained in:
Toshio Kuratomi 2016-02-29 00:21:02 -08:00 committed by Matt Clay
parent cea1125d02
commit ecafdeeaa5
2 changed files with 9 additions and 10 deletions

View file

@ -98,11 +98,11 @@ EXAMPLES = '''
def main():
arg_spec = dict(
name=dict(required=True),
config=dict(required=False),
config=dict(required=False, type='path'),
server_url=dict(required=False),
username=dict(required=False),
password=dict(required=False),
supervisorctl_path=dict(required=False),
supervisorctl_path=dict(required=False, type='path'),
state=dict(required=True, choices=['present', 'started', 'restarted', 'stopped', 'absent'])
)
@ -121,7 +121,6 @@ def main():
supervisorctl_path = module.params.get('supervisorctl_path')
if supervisorctl_path:
supervisorctl_path = os.path.expanduser(supervisorctl_path)
if os.path.exists(supervisorctl_path) and is_executable(supervisorctl_path):
supervisorctl_args = [supervisorctl_path]
else:
@ -131,7 +130,7 @@ def main():
supervisorctl_args = [module.get_bin_path('supervisorctl', True)]
if config:
supervisorctl_args.extend(['-c', os.path.expanduser(config)])
supervisorctl_args.extend(['-c', config])
if server_url:
supervisorctl_args.extend(['-s', server_url])
if username: