From 86ba8f4dff5fb9c7117bdbb64bb5fb4c6f05d780 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Thu, 23 Jan 2014 16:44:17 -0500 Subject: [PATCH] Fix git module parameters to conform to code standards --- CHANGELOG.md | 2 +- library/source_control/git | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a444ce8bf..6be5f58aa2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Major features/changes: * only_if, which is much older than when_foo and was deprecated, is similarly removed. * ssh connection plugin is now more efficient if you add 'pipelining=True' in ansible.cfg under [ssh_connection], see example.cfg * localhost/127.0.0.1 is not required to be in inventory if referenced, if not in inventory, it does not implicitly appear in the 'all' group. -* git module now takes sshopts and keyfile parameters to override how git calls ssh +* git module now takes ssh_opts and key_file parameters to override how git calls ssh New modules: diff --git a/library/source_control/git b/library/source_control/git index 86ae1043de..b769776a3a 100644 --- a/library/source_control/git +++ b/library/source_control/git @@ -49,7 +49,7 @@ options: version_added: "1.5" description: - Add the hostkey for the repo url if not already added. - sshopts: + ssh_opts: required: false default: None version_added: "1.5" @@ -57,13 +57,13 @@ options: - Creates a wrapper script and exports the path as GIT_SSH which git then automatically uses to override ssh arguments. An example value could be "-o StrictHostKeyChecking=no" - keyfile: + key_file: requird: false default: None version_added: "1.5" description: - - Uses the same wrapper method as sshopts to pass - "-i " to the ssh arguments used by git + - Uses the same wrapper method as ssh_opts to pass + "-i " to the ssh arguments used by git reference: required: false default: null @@ -414,8 +414,8 @@ def main(): depth=dict(default=None, type='int'), update=dict(default='yes', type='bool'), accept_hostkey=dict(default='no', type='bool'), - keyfile=dict(default=None, required=False), - sshopts=dict(default=None, required=False), + key_file=dict(default=None, required=False), + ssh_opts=dict(default=None, required=False), executable=dict(default=None), bare=dict(default='no', type='bool'), ), @@ -433,8 +433,8 @@ def main(): reference = module.params['reference'] git_path = module.params['executable'] or module.get_bin_path('git', True) - key_file = module.params['keyfile'] - ssh_opts = module.params['sshopts'] + key_file = module.params['key_file'] + ssh_opts = module.params['ssh_opts'] # create a wrapper script and export # GIT_SSH= as an environment variable