Merge pull request #36 from ansible/devel

Rebase
This commit is contained in:
Sean Sullivan
2021-02-03 18:40:12 -06:00
committed by GitHub
604 changed files with 29364 additions and 13070 deletions

View File

@@ -34,7 +34,7 @@ options:
scm_type:
description:
- Type of SCM resource.
choices: ["manual", "git", "hg", "svn", "insights"]
choices: ["manual", "git", "svn", "insights"]
default: "manual"
type: str
scm_url:
@@ -168,7 +168,7 @@ EXAMPLES = '''
organization: "test"
scm_update_on_launch: True
scm_update_cache_timeout: 60
custom_virtualenv: "/var/lib/awx/venv/ansible-2.2"
custom_virtualenv: "/var/lib/awx/var/lib/awx/venv/ansible-2.2"
state: present
tower_config_file: "~/tower_cli.cfg"
'''
@@ -220,7 +220,7 @@ def main():
argument_spec = dict(
name=dict(required=True),
description=dict(),
scm_type=dict(choices=['manual', 'git', 'hg', 'svn', 'insights'], default='manual'),
scm_type=dict(choices=['manual', 'git', 'svn', 'insights'], default='manual'),
scm_url=dict(),
local_path=dict(),
scm_branch=dict(default=''),