Version bump for 1.6.1 release

Fixes #7307

.cherry_picker.toml

@@ -1,5 +0,0 @@
-team = "ansible"
-repo = "ansible"
-check_sha = "f31421576b00f0b167cdbe61217c31c21a41ac02"  # the very first commit in repo
-fix_commit_msg = false  # Don't replace "#" with "GH-"
-default_branch = "devel"

.coveragerc

@@ -1,25 +0,0 @@
-# This configuration file is used for manual execution of coverage
-# as well as for tests run through ansible-test.
-
-[run]
-branch = True
-
-# Enable concurrency. This also enables parallel mode, which results in
-# multiple coverage files being created. Concurrency allows us to collect
-# results from multiple tests simultaneously, as well as supporting multiple
-# test runs, such as from integration tests.
-concurrency = multiprocessing
-parallel = True
-
-# When running tests through ansible-test, this option is overridden by
-# the COVERAGE_FILE environment variable. This option is present for
-# convenience when running coverage manually from this directory.
-data_file = test/results/coverage/coverage
-
-# Don't collect or report code coverage from files matching these patterns.
-omit =
-    */python*/dist-packages/*
-    */python*/site-packages/*
-    */python*/distutils/*
-    */pyshared/*
-    */pytest

.gitattributes

@@ -1,2 +0,0 @@
-.github/ export-ignore
-hacking/ export-ignore

.github/CODE_OF_CONDUCT.md

@@ -1,3 +0,0 @@
-# Community Code of Conduct
-
-Please see the official [Ansible Community Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html).

.github/ISSUE_TEMPLATE.md

@@ -1,58 +0,0 @@
-<!---
-Verify first that your issue/request is not already reported on GitHub.
-THIS FORM WILL BE READ BY A MACHINE, COMPLETE ALL SECTIONS AS DESCRIBED.
-Also test if the latest release, and devel branch are affected too.
-ALWAYS add information AFTER (OUTSIDE) these html comments.
-Otherwise it may end up being automatically closed by our bot. -->
-
-##### SUMMARY
-<!--- Explain the problem briefly -->
-
-##### ISSUE TYPE
-<!--- Pick one below and delete the rest -->
- - Bug Report
- - Feature Idea
- - Documentation Report
-
-##### COMPONENT NAME
-<!--- Insert, BELOW THIS COMMENT, the name of the module, plugin, task or feature.
-Do not include extra details here, e.g. "vyos_command" not "the network module vyos_command" or the full path-->
-
-##### ANSIBLE VERSION
-<!--- Paste, BELOW THIS COMMENT, verbatim output from "ansible --version" between quotes below -->
-```
-
-```
-
-##### CONFIGURATION
-<!--- If using Ansible 2.4 or above, paste, BELOW THIS COMMENT, the results of "ansible-config dump --only-changed"
-Otherwise, mention any settings you have changed/added/removed in ansible.cfg
-(or using the ANSIBLE_* environment variables).-->
-
-##### OS / ENVIRONMENT
-<!--- Mention, BELOW THIS COMMENT, the OS you are running Ansible from, and the OS you are
-managing, or say "N/A" for anything that is not platform-specific.
-Also mention the specific version of what you are trying to control,
-e.g. if this is a network bug the version of firmware on the network device.-->
-
-##### STEPS TO REPRODUCE
-<!--- For bugs, show exactly how to reproduce the problem, using a minimal test-case.
-For new features, show how the feature would be used. -->
-
-<!--- Paste example playbooks or commands between quotes below -->
-```yaml
-
-```
-
-<!--- You can also paste gist.github.com links for larger files -->
-
-##### EXPECTED RESULTS
-<!--- What did you expect to happen when running the steps above? -->
-
-##### ACTUAL RESULTS
-<!--- What actually happened? If possible run with extra verbosity (-vvvv) -->
-
-<!--- Paste verbatim command output between quotes below -->
-```
-
-```

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,61 +0,0 @@
----
-name: 🐛 Bug report
-about: Create a report to help us improve
-
----
-
-<!---
-Verify first that your issue/request is not already reported on GitHub.
-THIS FORM WILL BE READ BY A MACHINE, COMPLETE ALL SECTIONS AS DESCRIBED.
-Also test if the latest release, and devel branch are affected too.
-ALWAYS add information AFTER (OUTSIDE) these html comments.
-Otherwise it may end up being automatically closed by our bot. -->
-
-##### SUMMARY
-<!--- Explain the problem briefly -->
-
-##### ISSUE TYPE
- - Bug Report
-
-##### COMPONENT NAME
-<!--- Insert, BELOW THIS COMMENT, the name of the module, plugin, task or feature.
-Do not include extra details here, e.g. "vyos_command" not "the network module vyos_command" or the full path-->
-
-##### ANSIBLE VERSION
-<!--- Paste, BELOW THIS COMMENT, verbatim output from "ansible --version" between quotes below -->
-```
-
-```
-
-##### CONFIGURATION
-<!--- If using Ansible 2.4 or above, paste, BELOW THIS COMMENT, the results of "ansible-config dump --only-changed"
-Otherwise, mention any settings you have changed/added/removed in ansible.cfg
-(or using the ANSIBLE_* environment variables).-->
-
-##### OS / ENVIRONMENT
-<!--- Mention, BELOW THIS COMMENT, the OS you are running Ansible from, and the OS you are
-managing, or say "N/A" for anything that is not platform-specific.
-Also mention the specific version of what you are trying to control,
-e.g. if this is a network bug the version of firmware on the network device.-->
-
-##### STEPS TO REPRODUCE
-<!--- For bugs, show exactly how to reproduce the problem, using a minimal test-case.
-For new features, show how the feature would be used. -->
-
-<!--- Paste example playbooks or commands between quotes below -->
-```yaml
-
-```
-
-<!--- You can also paste gist.github.com links for larger files -->
-
-##### EXPECTED RESULTS
-<!--- What did you expect to happen when running the steps above? -->
-
-##### ACTUAL RESULTS
-<!--- What actually happened? If possible run with extra verbosity (-vvvv) -->
-
-<!--- Paste verbatim command output between quotes below -->
-```
-
-```

.github/ISSUE_TEMPLATE/documentation_report.md

@@ -1,61 +0,0 @@
----
-name: 📝 Documentation Report
-about: Ask us about docs
-
----
-
-<!---
-Verify first that your issue/request is not already reported on GitHub.
-THIS FORM WILL BE READ BY A MACHINE, COMPLETE ALL SECTIONS AS DESCRIBED.
-Also test if the latest release, and devel branch are affected too.
-ALWAYS add information AFTER (OUTSIDE) these html comments.
-Otherwise it may end up being automatically closed by our bot. -->
-
-##### SUMMARY
-<!--- Explain the problem briefly -->
-
-##### ISSUE TYPE
- - Documentation Report
-
-##### COMPONENT NAME
-<!--- Insert, BELOW THIS COMMENT, the name of the module, plugin, task or feature.
-Do not include extra details here, e.g. "vyos_command" not "the network module vyos_command" or the full path-->
-
-##### ANSIBLE VERSION
-<!--- Paste, BELOW THIS COMMENT, verbatim output from "ansible --version" between quotes below -->
-```
-
-```
-
-##### CONFIGURATION
-<!--- If using Ansible 2.4 or above, paste, BELOW THIS COMMENT, the results of "ansible-config dump --only-changed"
-Otherwise, mention any settings you have changed/added/removed in ansible.cfg
-(or using the ANSIBLE_* environment variables).-->
-
-##### OS / ENVIRONMENT
-<!--- Mention, BELOW THIS COMMENT, the OS you are running Ansible from, and the OS you are
-managing, or say "N/A" for anything that is not platform-specific.
-Also mention the specific version of what you are trying to control,
-e.g. if this is a network bug the version of firmware on the network device.-->
-
-##### STEPS TO REPRODUCE
-<!--- For bugs, show exactly how to reproduce the problem, using a minimal test-case.
-For new features, show how the feature would be used. -->
-
-<!--- Paste example playbooks or commands between quotes below -->
-```yaml
-
-```
-
-<!--- You can also paste gist.github.com links for larger files -->
-
-##### EXPECTED RESULTS
-<!--- What did you expect to happen when running the steps above? -->
-
-##### ACTUAL RESULTS
-<!--- What actually happened? If possible run with extra verbosity (-vvvv) -->
-
-<!--- Paste verbatim command output between quotes below -->
-```
-
-```

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,61 +0,0 @@
----
-name: ✨ Feature request
-about: Suggest an idea for this project
-
----
-
-<!---
-Verify first that your issue/request is not already reported on GitHub.
-THIS FORM WILL BE READ BY A MACHINE, COMPLETE ALL SECTIONS AS DESCRIBED.
-Also test if the latest release, and devel branch are affected too.
-ALWAYS add information AFTER (OUTSIDE) these html comments.
-Otherwise it may end up being automatically closed by our bot. -->
-
-##### SUMMARY
-<!--- Explain the problem briefly -->
-
-##### ISSUE TYPE
- - Feature Idea
-
-##### COMPONENT NAME
-<!--- Insert, BELOW THIS COMMENT, the name of the module, plugin, task or feature.
-Do not include extra details here, e.g. "vyos_command" not "the network module vyos_command" or the full path-->
-
-##### ANSIBLE VERSION
-<!--- Paste, BELOW THIS COMMENT, verbatim output from "ansible --version" between quotes below -->
-```
-
-```
-
-##### CONFIGURATION
-<!--- If using Ansible 2.4 or above, paste, BELOW THIS COMMENT, the results of "ansible-config dump --only-changed"
-Otherwise, mention any settings you have changed/added/removed in ansible.cfg
-(or using the ANSIBLE_* environment variables).-->
-
-##### OS / ENVIRONMENT
-<!--- Mention, BELOW THIS COMMENT, the OS you are running Ansible from, and the OS you are
-managing, or say "N/A" for anything that is not platform-specific.
-Also mention the specific version of what you are trying to control,
-e.g. if this is a network bug the version of firmware on the network device.-->
-
-##### STEPS TO REPRODUCE
-<!--- For bugs, show exactly how to reproduce the problem, using a minimal test-case.
-For new features, show how the feature would be used. -->
-
-<!--- Paste example playbooks or commands between quotes below -->
-```yaml
-
-```
-
-<!--- You can also paste gist.github.com links for larger files -->
-
-##### EXPECTED RESULTS
-<!--- What did you expect to happen when running the steps above? -->
-
-##### ACTUAL RESULTS
-<!--- What actually happened? If possible run with extra verbosity (-vvvv) -->
-
-<!--- Paste verbatim command output between quotes below -->
-```
-
-```

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,33 +0,0 @@
-##### SUMMARY
-<!--- Describe the change, including rationale and design decisions -->
-
-<!--- If you are fixing an existing issue, please include "Fixes #nnn" in your
-commit message and your description; but you should still explain what
-the change does.-->
-
-##### ISSUE TYPE
-<!--- Pick one below and delete the rest: -->
- - Feature Pull Request
- - New Module Pull Request
- - Bugfix Pull Request
- - Docs Pull Request
-
-##### COMPONENT NAME
-<!--- Name of the module, plugin, module or task -->
-
-##### ANSIBLE VERSION
-<!--- Paste verbatim output from "ansible --version" between quotes below -->
-```
-
-```
-
-
-##### ADDITIONAL INFORMATION
-<!--- Include additional information to help people understand the change here.
-For bugs that don't have a linked bug report, a step-by-step reproduction
-of the problem is helpful. -->
-
-<!--- Paste verbatim command output below, e.g. before and after your change -->
-```
-
-```

.gitignore

@@ -2,10 +2,9 @@
 *.py[co]
 build
 AUTHORS.TXT
-# Emacs backup and autosave files...
+# Emacs backup files...
 *~
 .\#*
-\#*
 # RPM stuff...
 MANIFEST
 dist
@@ -17,90 +16,37 @@ rpm-build
 .idea
 #IntelliJ IDEA stuff..
 *.iml
-#VSCode stuff..
-.vscode/
 # Mac OS X stuff...
 .DS_Store
 # manpage build stuff...
-docs/man/man1/ansible*.1
-docs/man/man1/ansible*.1.asciidoc.in
 docs/man/man3/*
 # Sublime stuff
 *.sublime-project
 *.sublime-workspace
 # docsite stuff...
-docs/api/_build/
-docs/api/rst/
-docs/docsite/_build
-docs/docsite/*.html
-docs/docsite/htmlout
-docs/docsite/rst/cli/ansible-*.rst
-docs/docsite/rst/cli/ansible.rst
-docs/docsite/rst/modules/*.rst
-docs/docsite/rst/playbooks_directives.rst
-docs/docsite/rst/plugins_by_category.rst
-docs/docsite/rst/plugins/*/*.rst
-docs/docsite/rst/reference_appendices/config.rst
-docs/docsite/rst/reference_appendices/playbooks_keywords.rst
-docs/docsite/rst_warnings
-docs/docsite/searchindex.js
-docs/docsite/_static/*.gif
-docs/docsite/_static/*.png
-docs/docsite/_static/websupport.js
+docsite/rst/modules_by_category.rst
+docsite/rst/list_of_*.rst
+docsite/rst/*_module.rst
+docsite/*.html
+docsite/_static/*.gif
+docsite/_static/*.png
+docsite/_static/websupport.js
+docsite/searchindex.js
+docsite/htmlout
 # deb building stuff...
-/debian/
-deb-build
+debian/
 # Vim swap files
 *.swp
 *.swo
 credentials.yml
 # test output
-*.retry
-*.out
-.pytest_cache/
-.tox
-.cache
-.pytest_cache
+.coverage
 results.xml
 coverage.xml
 /test/units/cover-html
-/test/integration/targets/*/backup/
-/test/cache/*
 # Development
 /test/develop
 venv
 Vagrantfile
 .vagrant
 ansible.egg-info/
-/shippable/
-/test/integration/cloud-config-*.*
-!/test/integration/cloud-config-*.*.template
-.python-version
-# Release directory
-packaging/release/ansible_release
-/.cache/
-/test/results/coverage/*=coverage.*
-/test/results/coverage/coverage*
-/test/results/reports/coverage*.xml
-/test/results/reports/coverage*/
-/test/results/bot/*.json
-/test/results/junit/*.xml
-/test/results/logs/*.log
-/test/results/data/*.json
-/test/integration/inventory.remote
-/test/integration/inventory.networking
-/test/integration/inventory.winrm
-/test/integration/cloud-config-aws.yml
-/test/integration/cloud-config-cs.ini
-# python 'rope' stuff
-.ropeproject
-# local 'ack' config files
-.ackrc
-# default 'coverage html' results
-htmlcov/
-# default 'coverage' tool data
-.coverage
-# ansible-test coverage results
-test/units/.coverage.*
-/test/integration/cloud-config-azure.yml
-changelogs/.plugin-cache.yaml

.mailmap

@@ -1,36 +0,0 @@
-Michael DeHaan <michael.dehaan@gmail.com> <michael@ansibleworks.com>
-Michael DeHaan <michael.dehaan@gmail.com> Michael DeHaan <michael@ansibleworks.com>
-Michael DeHaan <michael.dehaan@gmail.com> <michael@ansible.com>
-<bcoca@ansible.com> <brian.coca+git@gmail.com>
-<bcoca@ansible.com> <briancoca+ansible@gmail.com>
-<bcoca@ansible.com> <briancoca+dev@gmail.com>
-<bcoca@ansible.com> <bcoca@tablethotels.com>
-<a.badger@gmail.com> <toshio@fedoraproject.org>
-James Tanner <tanner.jc@gmail.com>
-<jimi@sngx.net> <jcammarata@ansibleworks.com>
-Michael Scherer <misc@zarb.org> mscherer <misc@zarb.org>
-<misc@zarb.org> <misc@ephaone.org>
-<misc@zarb.org> <mscherer@users.noreply.github.com>
-James Martin <jmartin@ansible.com> <jmartin@basho.com>
-James Laska <jlaska@ansible.com> <jlaska@redhat.com>
-James Laska <jlaska@ansible.com> <jlaska@ansibleworks.com>
-James Laska <jlaska@ansible.com> <jlaska@James-Laskas-MacBook-Pro.local>
-James Laska <jlaska@ansible.com> <jlaska@users.noreply.github.com>
-Jason McKerr <mckerrj@gmail.com> <jmckerr@jmckerr-OSX.local>
-Chris Houseknecht <chouseknecht@ansible.com>
-Chris Houseknecht <chouseknecht@ansible.com> chouseknecht <chouse@ansible.com>
-Chris Houseknecht <chouseknecht@ansible.com> Chris Houseknecht <chouse@ansibleworks.com>
-Stephen Fromm <sfromm@gmail.com> Stephen Fromm <stephenf@nero.net>
-Sandra Wills <docschick@ansible.com> Sandra Wills <swills@ansible.com>
-Will Thames <will@thames.id.au> willthames <will@thames.id.au>
-Will Thames <will@thames.id.au> Will Thames <willdthames@gmail.com>
-Will Thames <will@thames.id.au> willthames <willdthames@gmail.com>
-Will Thames <will@thames.id.au> willthames <will@musc.org.uk>
-Will Thames <will@thames.id.au> u348095 <will.thames@suncorp.com.au>
-Will Thames <will@thames.id.au> willthames <will.thames@suncorp.com.au>
-Will Thames <will@thames.id.au> Will Thames <will.thames@xvt.com.au>
-nitzmahone <mdavis@ansible.com> Matt Davis <nitzmahone@users.noreply.github.com>
-Dag Wieers <dag@wieers.com> Dag Wieërs <dag@wieers.com>
-Dag Wieers <dag@wieers.com> Dag Wieers <dag.wieers@gmail.com>
-Rene Moser <mail@renemoser.net> René Moser <mail@renemoser.net>
-Rene Moser <mail@renemoser.net> Rene Moser <rene.moser@swisstxt.ch>

CODING_GUIDELINES.md

@@ -1,10 +1,10 @@
 Coding Guidelines
 =================
 
-Hi!  Thanks for your interest in contributing to Ansible.
+Hi!  Thanks for interest in contributing to Ansible.
 
-Here are some guidelines for contributing code.  The purpose of this document is to establish what we're looking for in code contributions, and to make sure
-new contributors know some of the conventions that we've been using.
+Here are some guidelines for contributing code.  The purpose of this document are to establish what we're looking for in code contributions, and to make sure
+new contributions know some of the conventions that we've been using.
 
 We don't think much of this should be too strange to readers familiar with contributing to Python projects, though it helps if we all get on the same page.
 
@@ -12,27 +12,27 @@ Language
 ========
 
   * While not all components of Ansible must be in Python, core contributions to the Ansible repo must be written in Python.  This is to maximize the ability of everyone to contribute.
-  * If you want to write non-Python ansible modules or inventory scripts, that's fine, but they are not going to get merged in most likely.  Sorry!!
+  * If you want to write non-Python ansible modules or inventory scripts, that's fine, but they are not going to get merged in most likely.  Sorry!!  
 
-PEP 8 and basic style checks
-============================
+PEP8 and basic style checks
+===========================
 
-  * [PEP 8](https://www.python.org/dev/peps/pep-0008/) is a great Python style guide, which you should read.
-  * PEP 8 must not be strictly followed in all aspects, but most of it is good advice.
-  * The line is limited to 160 characters.
-  * To run checks for things we care about, use [ansible-test](https://docs.ansible.com/ansible/devel/dev_guide/testing_sanity.html).
-  * Similarly, additional checks can be made with "make pyflakes".
-  * There is no need to submit code changes for PEP 8 and pyflakes fixes, as these break attribution history.  Project leadership will make these periodically.
-  * Do not submit pull requests that simply adjust whitespace in the code.
+  * PEP8 is a great Python style guide, which you should read.
+  * PEP8 must not be strictly followed in all aspects, but most of it is good advice
+  * In particular, we don't really care about line lengths.  Buy a bigger monitor!
+  * To run checks for things we care about, run "make pep8"
+  * Similarly, additional checks can be made with "make pyflakes"
+  * There is no need to submit code changes for pep8 and pyflake fixes, as these break attribution history.  Project leadership will make these periodically.
+  * Do not submit pull requests that simply adjust whitespace in the code
 
 Testing
 =======
 
-  * Much of Ansible's testing needs are in integration, not unit tests.  Add module tests there.
+  * Much of ansible's testing needs are in integration, not unit tests.  Add module tests there.
   * That being said, there are unit tests too!
   * Code written must absolutely pass tests (i.e. "make tests")
   * You should anticipate any error paths in your code and test down those error paths.
-  * Additions to tests for core code are welcome, but not always possible.  Be sure things are at least well tested manually in that case.
+  * Additions to tests for core code is welcome, but not always possible.  Be sure things are at least well tested manually in that case.
 
 Whitespace
 ==========
@@ -42,7 +42,7 @@ Whitespace
 
 Shebang Lines
 =============
-
+ 
   * /usr/bin/scripts should start with '/usr/bin/env python'
   * module code should still use '/usr/bin/python' as this is replaced automatically by 'ansible_python_interpreter', see the FAQ in the docs for more info.
 
@@ -60,13 +60,13 @@ Classes
 
   * With the exception of module code (where inline is better), it is desirable to see classes in their own files.
   * Classes should generally not cause side effects as soon as they are instantiated, move meaningful behavior to methods rather than constructors.
-
+ 
 Functions and Methods
 =====================
 
   * In general, functions should not be 'too long' and should describe a meaningful amount of work
   * When code gets too nested, that's usually the sign the loop body could benefit from being a function
-  * Parts of our existing code are not the best examples of this at times.
+  * Parts of our existing code are not the best examples of this at times. 
   * Functions should have names that describe what they do, along with docstrings
   * Functions should be named with_underscores
   * "Don't repeat yourself" is generally a good philosophy
@@ -74,7 +74,7 @@ Functions and Methods
 Variables
 =========
 
-  * Use descriptive variable names instead of variables like 'x', unless x is an obvious loop index
+  * Use descriptive variable names instead of variables like 'x', unless x is a obvious loop index
   * Ansible python code uses identifiers like 'ClassesLikeThis and variables_like_this
   * Module parameters should also use_underscores and not runtogether
 
@@ -83,7 +83,7 @@ Module Security
 
   * Modules must take steps to avoid passing user input from the shell and always check return codes
   * always use module.run_command instead of subprocess or Popen or os.system -- this is mandatory
-  * if you need to use the shell you must pass use_unsafe_shell=True to module.run_command
+  * if you use need the shell you must pass use_unsafe_shell=True to module.run_command
   * if you do not need the shell, avoid using the shell
   * any variables that can come from the user input with use_unsafe_shell=True must be wrapped by pipes.quote(x)
   * downloads of https:// resource urls must import module_utils.urls and use the fetch_url method
@@ -101,26 +101,26 @@ Use the dict constructor where possible when allocating dictionaries:
 
     # this:
     foo = dict(
-       a=12,
-       b=34,
+       a = 12,
+       b = 34
     )
 
-Do not line up variables
+Line up variables
 
     # not this
+    a  = 12
+    foosball = 34
+    xyz = 'dog'
+
+    # this
     a        = 12
     foosball = 34
     xyz      = 'dog'
 
-    # this
-    a = 12
-    foosball = 34
-    xyz = 'dog'
-
 Don't use line continuations:
 
     # no
-    if (this_is_a_very_long_line and foo and \
+    if (this_is_a_very_long_line and foo and /
        i_am_going_to_continue_it):
           bar()
 
@@ -131,13 +131,13 @@ Don't use line continuations:
 Spacing:
 
     # no
-    x = [1,2,3]
+    x=[1,2,3]
 
     # no
-    x = [ 1, 2, 3 ]
+    x = [1,2,3]
 
     # yes
-    x = [1, 2, 3]
+    x = [ 1, 2, 3 ]
 
 Spacing continued:
 
@@ -161,24 +161,24 @@ All contributions to the core repo should preserve original licenses and new con
 Module Documentation
 ====================
 
-All module pull requests must include a DOCUMENTATION docstring (YAML format,
-see other modules for examples) as well as an EXAMPLES docstring, which is free form.
+All module pull requests must include a DOCUMENTATION docstring (YAML format, 
+see other modules for examples) as well as an EXAMPLES docstring, which is free form.  
 
-When adding new modules, any new parameter must have a "version_added" attribute.
-When submitting a new module, the module should have a "version_added" attribute in the
+When adding new modules, any new parameter must have a "version_added" attribute.  
+When submitting a new module, the module should have a "version_added" attribute in the 
 pull request as well, set to the current development version.
 
 Be sure to check grammar and spelling.
 
-It's frequently the case that modules get submitted with YAML that isn't valid,
-so you can run "make webdocs" from the checkout to preview your module's documentation.
-If it fails to build, take a look at your DOCUMENTATION string
+It's frequently the case that modules get submitted with YAML that isn't valid, 
+so you can run "make webdocs" from the checkout to preview your module's documentation. 
+If it fails to build, take a look at your DOCUMENTATION string 
 or you might have a Python syntax error in there too.
 
 Python Imports
 ==============
 
-To make it clear what a module is importing, imports should not be sprinkled throughout the code.
+To make it clear what a module is importing, imports should not be sprinkled throughout the code. 
 
 Python Imports should happen at the top of the file, exempting code from module_utils.
 
@@ -203,7 +203,7 @@ Exceptions
 ==========
 
 In the main body of the code, use typed exceptions where possible:
-
+    
     # not this
     raise Exception("panic!")
 
@@ -265,7 +265,7 @@ Use 'in':
     # not this:
     if x.find('foo') != -1:
 
-    # this:
+    # this: 
     if 'foo' in x:
 
 String checks
@@ -277,8 +277,7 @@ To test if something is a string, consider that it may be unicode.
     if type(x) == str:
 
     # yes
-    from ansible.module_utils.six import string_types
-    if isinstance(x, string_types):
+    if isinstance(x, basestring):
 
 Cleverness
 ==========
@@ -290,19 +289,19 @@ In particular, metaclasses are probably not appropriate, however entertaining th
 Git Practices
 =============
 
-Pull requests cannot be accepted if they contain merge commits.
+Pull requests cannot be accepted that contain merge commits.
 
-Always do "git pull --rebase" and "git rebase" vs "git pull" or "git merge". See [rebasing a pull request](https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html) for more information.
-
-Always create a new branch for each pull request to avoid intermingling different features or fixes on the same branch.
+Always do "git pull --rebase" and "git rebase" vs "git pull" or "git merge".
 
+Always create a new branch for each pull request to avoid intertwingling different features or fixes on the same branch.
 
+   
 Python Version Compliance
 =========================
 
 All code in Ansible core must support a minimum version of Python 2.6.
 
-Module code must support a minimum of Python 2.4, with occasional exceptions for modules that require code that themselves require 2.6 and later.
+Module code must support a minimum of Python 2.4, with occasional exception for modules that require code that themselves require 2.6 and later.
 
 A quick reminder is that list comprehensions in Python 2.4 are not as fully fleshed out, there are no 'dict' comprehensions, and there is no 'with' statement.
 But otherwise it's pretty much all the same.
@@ -314,3 +313,7 @@ This was not meant to be a scary document, so we hope it wasn't, but we also hop
 If you have questions about this document, please ask on the ansible-devel mailing list.
 
 Thank you!
+
+
+
+

CONTRIBUTING.md

@@ -1,28 +1,224 @@
-# WELCOME TO ANSIBLE GITHUB
+Ansible Community  Information
+==============================
 
-Hi! Nice to see you here!
+The purpose of the Ansible community is to  unite developers, system administrators, operations, and 
+IT managers to share and build great automation solutions.  This document contains all sorts of 
+information about how to contribute and interact with Ansible.  Welcome!
 
-## QUESTIONS ?
+Ways to Interact
+================
 
-Please see the [community guide](https://docs.ansible.com/ansible/latest/community/index.html) for information on how to ask questions on the [mailing lists](https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information) and IRC.
+There are a lot of ways to join and  be a part  of the  Ansible community, such as:
 
-The GitHub issue tracker is not the best place for questions for various reasons, but both IRC and the mailing list are very helpful places for those things, as the community page explains best.
+Sharing Ansible with Others
+---------------------------
 
-## CONTRIBUTING ?
+You can help share Ansible with others by telling friends and colleagues, writing a blog post, 
+or presenting at user groups (like DevOps groups or the local LUG or BUG).  You are also 
+welcome to share slides on speakerdeck, sign up for a free account and tag it “Ansible”. On Twitter, 
+you can also share things with #ansible and may wish 
+to follow [@Ansible](https://twitter.com/ansible).
 
-By contributing you agree that these contributions are your own (or approved by your employer) and you grant a full, complete, irrevocable copyright license to all users and developers of the project, present and future, pursuant to the license of the project.
+Sharing Content and Tips
+------------------------
 
-Please see the [community guide](https://docs.ansible.com/ansible/latest/community/index.html) for information regarding the contribution process. Important license agreement information is also included on that page.
+Join the [Ansible project mailing list](https://groups.google.com/forum/#!forum/ansible-project) and you 
+can share playbooks you may have written and other interesting implementation stories. Put your Ansible 
+content up on places like github  to share with others.
 
-## BUG TO REPORT ?
+Sharing A Feature Idea
+----------------------
 
-First and foremost, also check the [community guide](https://docs.ansible.com/ansible/latest/community/index.html).
+Ideas are very welcome and the best place to share them is the [Ansible project mailing list](https://groups.google.com/forum/#!forum/ansible-project) ([Subscribe](https://groups.google.com/forum/#!forum/ansible-project/join)) or #ansible on irc.freenode.net.
 
-You can report bugs or make enhancement requests at the [Ansible GitHub issue page](http://github.com/ansible/ansible/issues/new/choose) by filling out the issue template that will be presented.
+While you can file a feature request on GitHub, pull requests are a much better way to get your feature added than submitting a feature request.  Open source is all about itch scratching, and it's less likely that someone else will have the same itches as yourself.  We keep code reasonably simple on purpose so it's easy to dive in and make additions, but be sure to read the "Contributing Code" section below too -- as it doesn't hurt to have a discussion about a feature first -- we're inclined to have preferences about how incoming features might be implemented, and that can save confusion later.
+
+Helping with Documentation
+--------------------------
+
+Ansible documentation is a community project too!  If you would like to help with the 
+documentation, whether correcting a typo or improving a section, or maybe even 
+documenting a new feature, submit a github pull request to  the code that
+lives in the “docsite/rst” subdirectory of the project.   Docs are in restructured text
+format.  If you aren’t comfortable with restructured text, you can also open a ticket on 
+github about any errors you spot or sections you would like to see added. For more information
+on creating pull requests, please refer to the
+[github help guide](https://help.github.com/articles/using-pull-requests).
+
+
+Contributing Code (Features or Bugfixes)
+----------------------------------------
+
+The Ansible project keeps it’s source on github at 
+[github.com/ansible/ansible](http://github.com/ansible/ansible) 
+and takes contributions through
+[github pull requests](https://help.github.com/articles/using-pull-requests).
+
+It is usually a good idea to join the ansible-devel list to discuss any large features prior to submission, and this especially helps in avoiding duplicate work or efforts where we decide, upon seeing a pull request for the first time, that revisions are needed.  (This is not usually needed for module development)
+
+Note that we do keep Ansible to a particular aesthetic, so if you are unclear about whether a feature
+is a good fit or not, having the discussion on the development list is often a lot easier than having
+to modify a pull request later.
+
+When submitting patches, be sure to run the unit tests first “make tests” and always use 
+“git rebase” vs “git merge” (aliasing git pull to git pull --rebase is a great idea) to 
+avoid merge commits in your submissions.  There are also integration tests that can be run in the "tests/integration" directory.  
+
+In order to keep the history clean and better audit incoming code, we will require resubmission of pull requests that contain merge commits.  Use "git pull --rebase" vs "git pull" and "git rebase" vs "git merge". Also be sure to use topic branches to keep your additions on different branches, such that they won't pick up stray commits later.
+
+We’ll then review your contributions and engage with you about questions and  so on.  
+
+As we have a very large and active community, so it may take awhile to get your contributions 
+in!  See the notes about priorities in a later section for understanding our work queue.
+
+Patches should be made against the 'devel' branch.
+
+Contributions can be for new features like modules, or to fix bugs you or others have found. If you 
+are interested in writing new modules to be included in the core Ansible distribution, please refer 
+to the [Module Developers documentation on our website](http://docs.ansible.com/developing_modules.html).
+
+Ansible's aesthetic encourages simple, readable code and consistent, conservatively extending, 
+backwards-compatible improvements.  Code developed for Ansible needs to support Python 2.6+, 
+while code in modules must run under Python 2.4 or higher.  Please also use a 4-space indent
+and no tabs.
+
+Tip: To easily run from a checkout, source "./hacking/env-setup" and that's it -- no install
+required.  You're now live!
+
+
+Reporting A Bug
+---------------
+
+Ansible practices responsible disclosure - if this is a security related bug, email security@ansible.com instead of filing a ticket or posting to the Google Group and you will recieve a prompt response.
+
+Bugs should be reported to [github.com/ansible/ansible](http://github.com/ansible/ansible) after 
+signing up for a free github account.  Before reporting a bug, please use the bug/issue search 
+to see if the issue has already been reported.  
+
+When filing a bug, please use the [issue template](https://raw2.github.com/ansible/ansible/devel/examples/issues/ISSUE_TEMPLATE.md) to provide all relevant information.
+
+Do not use the issue tracker for "how do I do this" type questions.  These are great candidates
+for IRC or the mailing list instead where things are likely to be more of a discussion.
+
+To be respectful of reviewers time and allow us to help everyone efficiently, please 
+provide minimal well-reduced and well-commented examples versus sharing your entire production
+playbook.  Include playbook snippets and output where possible.  
+
+Content in the GitHub bug tracker can be indented four spaces to preserve formatting.  
+For multiple-file content, we encourage use of gist.github.com.  Online pastebin content can expire.
+
+If you are not sure if something is a bug yet, you are welcome to ask about something on 
+the mailing list or IRC first.  As we are a very high volume project, if you determine that 
+you do have a bug, please be sure to open the issue yourself to ensure we have a record of
+it. Don’t rely on someone else in the community to file the bug report for you.
+
+It may take some time to get to your report, see "A Note About Priorities" below.
+
+A Note About Priorities
+=======================
+
+Ansible was one of the top 5 projects with the most OSS contributors on GitHub in 2013, and well over
+600 people have added code to the project.  As a result, we have a LOT of incoming activity to process.
+
+In the interest of transparency, we're telling you how we do this.
+
+In our bug tracker you'll notice some labels - P1, P2, P3, P4, and P5.  These are our internal
+priority orders that we use to sort tickets.  
+
+With some exceptions for easy merges (like documentation typos for instance), 
+we're going to spend most of our time working on P1 and P2 items first, including pull requests.  
+These usually relate to important
+bugs or features affecting large segments of the userbase.  So if you see something categorized
+"P3 or P4", and it's not appearing to get a lot of immediate attention, this is why.
+
+These labels don't really have definition - they are a simple ordering.  However something
+affecting a major module (yum, apt, etc) is likely to be prioritized higher than a module
+affecting a smaller number of users.
+
+Since we place a strong emphasis on testing and code review, it may take a few months for a minor feature to get merged.
+
+Don't worry though -- we'll also take periodic sweeps through the lower priority queues and give
+them some attention as well, particularly in the area of new module changes.  So it doesn't neccessarily
+mean that we'll be exhausting all of the higher-priority queues before getting to your ticket.
+
+Release Numbering
+=================
+
+Releases ending in ".0" are major releases and this is where all new features land.  Releases ending
+in another integer, like "0.X.1" and "0.X.2" are dot releases, and these are only going to contain
+bugfixes.  Typically we don't do dot releases for minor releases, but may occasionally decide to cut
+dot releases containing a large number of smaller fixes if it's still a fairly long time before
+the next release comes out.
+
+Online Resources
+================
+
+Documentation
+-------------
+
+The main ansible documentation can be found at [docs.ansible.com](http://docs.ansible.com). 
+As mentioned above this is an open source project, so we accept contributions to the documentation. 
+You can also find some best practices examples that we recommend reading at 
+[ansible-examples](http://github.com/ansible/ansible-examples).
+
+Mailing lists
+-------------
+
+Ansible has several mailing lists.  Your first post to the mailing list will be 
+moderated (to reduce spam), so please allow a day or less for your first post.
+
+[ansible-announce](https://groups.google.com/forum/#!forum/ansible-announce) is for release 
+announcements and major news.  It is a low traffic read-only list and you should only get a few 
+emails a month.
+
+[ansible-project](https://groups.google.com/forum/#!forum/ansible-project) is the main list, and is 
+used for sharing cool projects you may have built, talking about Ansible ideas, and for users to ask 
+questions or to help other users.
+
+[ansible-devel](https://groups.google.com/forum/#!forum/ansible-devel) is a technical list for 
+developers working on Ansible and Ansible modules.  Join here to discuss how to build modules, 
+prospective feature implementations, or technical challenges.
+
+To subscribe to a group from a non-google account, you can email the subscription address, for 
+example ansible-devel+subscribe@googlegroups.com.
+
+IRC
+---
+
+Ansible has a general purpose IRC channel available at #ansible on irc.freenode.net.
+Use this channel for all types of conversations, including sharing tips, coordinating 
+development work, or getting help from other users.
+
+Miscellaneous Information
+=========================
+
+Staff
+-----
+
+Ansible, Inc is a company supporting Ansible and building additional solutions based on 
+Ansible.  We also do services and support for those that are interested.   Our most 
+important task however is enabling all the great things that happen in the Ansible 
+community, including organizing software releases of Ansible.  For more information about
+any of these things, contact info@ansible.com
+
+On IRC, you can find us as mdehaan, jimi_c, Tybstar, and others.   On the mailing list, 
+we post with an @ansible.com address.
+
+Community Code of Conduct
+-------------------------
+
+Ansible’s community welcomes users of all types, backgrounds, and skill levels. Please 
+treat others as you expect to be treated, keep discussions positive, and avoid discrimination, profanity, allegations of Cthulhu worship, or engaging in controversial debates (except vi vs emacs is cool).  
+
+Posts to mailing lists  should remain focused around Ansible and IT automation.   Abuse of these community guidelines will not be tolerated and may result in banning from community resources.
+
+Contributors License Agreement
+------------------------------
+
+By contributing you agree that these contributions are your own (or approved by your employer) 
+and you grant a full, complete, irrevocable
+copyright license to all users and developers of the project, present and future, pursuant 
+to the license of the project.
 
-Also please make sure you are testing on the latest released version of Ansible or the development branch. You can find the latest releases and development branch at:
 
-- https://github.com/ansible/ansible/releases
-- https://github.com/ansible/ansible/archive/devel.tar.gz
 
-Thanks!

MANIFEST.in

@@ -1,25 +1,8 @@
-include README.rst
-include COPYING
-include SYMLINK_CACHE.json
-include requirements.txt
-include .coveragerc
-include shippable.yml
-include tox.ini
-include bin/ansible-test
+include README.md packaging/rpm/ansible.spec COPYING
 include examples/hosts
 include examples/ansible.cfg
-include examples/scripts/ConfigureRemotingForAnsible.ps1
-include examples/scripts/upgrade_to_ps3.ps1
-recursive-include lib/ansible/executor/powershell *
-recursive-include lib/ansible/module_utils/powershell *
-recursive-include lib/ansible/modules *
-recursive-include lib/ansible/galaxy/data *
+graft examples/playbooks
+include packaging/distutils/setup.py
 recursive-include docs *
-recursive-include licenses *
-recursive-include packaging *
-recursive-include test *
+recursive-include library *
 include Makefile
-include MANIFEST.in
-include changelogs/CHANGELOG-*.rst
-include contrib/README.md
-recursive-include contrib/inventory *

MODULE_GUIDELINES.md

@@ -1,3 +0,0 @@
-# Module Maintainer Guidelines
-
-The Ansible Module Maintainer Guidelines can now be found in the [official Ansible community guide](https://docs.ansible.com/ansible/latest/community/maintainers.html).

Makefile

@@ -1,211 +1,110 @@
+#!/usr/bin/make
 # WARN: gmake syntax
 ########################################################
 # Makefile for Ansible
 #
 # useful targets:
 #   make sdist ---------------- produce a tarball
-#   make srpm ----------------- produce a SRPM
 #   make rpm  ----------------- produce RPMs
-#   make deb-src -------------- produce a DEB source
 #   make deb ------------------ produce a DEB
 #   make docs ----------------- rebuild the manpages (results are checked in)
-#   make tests ---------------- run the tests (see https://docs.ansible.com/ansible/devel/dev_guide/testing_units.html for requirements)
+#   make tests ---------------- run the tests
 #   make pyflakes, make pep8 -- source code checks
 
 ########################################################
 # variable section
 
-NAME = ansible
+NAME = "ansible"
 OS = $(shell uname -s)
-PREFIX ?= '/usr/local'
 
+# Manpages are currently built with asciidoc -- would like to move to markdown
 # This doesn't evaluate until it's called. The -D argument is the
 # directory of the target file ($@), kinda like `dirname`.
-MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
-ifneq ($(shell which rst2man 2>/dev/null),)
-ASCII2MAN = rst2man $< $@
-else ifneq ($(shell which rst2man.py 2>/dev/null),)
-ASCII2MAN = rst2man.py $< $@
+MANPAGES := docs/man/man1/ansible.1 docs/man/man1/ansible-playbook.1 docs/man/man1/ansible-pull.1 docs/man/man1/ansible-doc.1 docs/man/man1/ansible-galaxy.1 docs/man/man1/ansible-vault.1
+ifneq ($(shell which a2x 2>/dev/null),)
+ASCII2MAN = a2x -D $(dir $@) -d manpage -f manpage $<
+ASCII2HTMLMAN = a2x -D docs/html/man/ -d manpage -f xhtml
 else
-ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
+ASCII2MAN = @echo "ERROR: AsciiDoc 'a2x' command is not installed but is required to build $(MANPAGES)" && exit 1
 endif
-GENERATE_CLI = docs/bin/generate_man.py
 
 PYTHON=python
 SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
-# fetch version from project release.py as single source-of-truth
-VERSION := $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --raw || echo error)
-ifeq ($(findstring error,$(VERSION)), error)
-$(error "version_helper failed")
-endif
-
-MAJOR_VERSION := $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --majorversion)
-CODENAME := $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --codename)
-
-# if a specific release was not requested, set to 1 (RPMs have "fancier" logic for this further down)
-RELEASE ?= 1
+# VERSION file provides one place to update the software version
+VERSION := $(shell cat VERSION)
 
 # Get the branch information from git
 ifneq ($(shell which git),)
-GIT_DATE := $(shell git log -n 1 --format="%ci")
-GIT_HASH := $(shell git log -n 1 --format="%h")
-GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD | sed 's/[-_.\/]//g')
-GITINFO = .$(GIT_HASH).$(GIT_BRANCH)
-else
-GITINFO = ""
+GIT_DATE := $(shell git log -n 1 --format="%ai")
 endif
 
-ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1)
-DATE := $(shell date -j -r $(shell git log -n 1 --format="%ct") +%Y%m%d%H%M)
-CPUS ?= $(shell sysctl hw.ncpu|awk '{print $$2}')
+ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD'),1)
+DATE := $(shell date -j -r $(shell git log -n 1 --format="%at") +%Y%m%d%H%M)
 else
 DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M)
-CPUS ?= $(shell nproc)
 endif
 
-# DEB build parameters
-DEBUILD_BIN ?= debuild
-DEBUILD_OPTS = --source-option="-I"
-DPUT_BIN ?= dput
-DPUT_OPTS ?=
-DEB_DATE := $(shell LC_TIME=C date +"%a, %d %b %Y %T %z")
-DEB_VERSION ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --debversion)
-ifeq ($(OFFICIAL),yes)
-    DEB_RELEASE ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --debrelease)ppa
-    # Sign OFFICIAL builds using 'DEBSIGN_KEYID'
-    # DEBSIGN_KEYID is required when signing
-    ifneq ($(DEBSIGN_KEYID),)
-        DEBUILD_OPTS += -k$(DEBSIGN_KEYID)
-    endif
-else
-    DEB_RELEASE ?= 100.git$(DATE)$(GITINFO)
-    # Do not sign unofficial builds
-    DEBUILD_OPTS += -uc -us
-    DPUT_OPTS += -u
-endif
-DEBUILD = $(DEBUILD_BIN) $(DEBUILD_OPTS)
-DEB_PPA ?= ppa
-# Choose the desired Ubuntu release: lucid precise saucy trusty
-DEB_DIST ?= unstable
-
-# pbuilder parameters
-PBUILDER_ARCH ?= amd64
-PBUILDER_CACHE_DIR = /var/cache/pbuilder
-PBUILDER_BIN ?= pbuilder
-PBUILDER_OPTS ?= --debootstrapopts --variant=buildd --architecture $(PBUILDER_ARCH) --debbuildopts -b
-
 # RPM build parameters
 RPMSPECDIR= packaging/rpm
 RPMSPEC = $(RPMSPECDIR)/ansible.spec
 RPMDIST = $(shell rpm --eval '%{?dist}')
-
-ifneq ($(OFFICIAL),yes)
-    RPMRELEASE = 100.git$(DATE)$(GITINFO)
-endif
-ifeq ($(PUBLISH),nightly)
-    # https://fedoraproject.org/wiki/Packaging:Versioning#Snapshots
-    RPMRELEASE = $(RELEASE).$(DATE)git.$(GIT_HASH)
+RPMRELEASE = 1
+ifeq ($(OFFICIAL),)
+    RPMRELEASE = 0.git$(DATE)
 endif
+RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)"
 
-RPMVERSION ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --baseversion)
-RPMRELEASE ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --rpmrelease)
-RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)$(REPOTAG)"
-
-# MOCK build parameters
-MOCK_BIN ?= mock
-MOCK_CFG ?=
-
-# dynamically add repotag define only if specified
-ifneq ($(REPOTAG),)
-    EXTRA_RPM_DEFINES += --define "repotag $(REPOTAG)"
-endif
-
-# ansible-test parameters
-ANSIBLE_TEST ?= bin/ansible-test
-TEST_FLAGS ?=
-
-# ansible-test units parameters (make test / make test-py3)
-PYTHON_VERSION ?= $(shell python2 -c 'import sys; print("%s.%s" % sys.version_info[:2])')
-PYTHON3_VERSION ?= $(shell python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])')
-
-# ansible-test integration parameters (make integration)
-IMAGE ?= centos7
-TARGET ?=
+NOSETESTS ?= nosetests
 
 ########################################################
 
-.PHONY: all
 all: clean python
 
-.PHONY: tests
 tests:
-	$(ANSIBLE_TEST) units -v --python $(PYTHON_VERSION) $(TEST_FLAGS)
+	PYTHONPATH=./lib ANSIBLE_LIBRARY=./library  $(NOSETESTS) -d -w test/units -v
 
-.PHONY: tests-py3
-tests-py3:
-	$(ANSIBLE_TEST) units -v --python $(PYTHON3_VERSION) $(TEST_FLAGS)
-
-.PHONY: tests-nonet
-tests-nonet:
-	$(ANSIBLE_TEST) units -v --python $(PYTHON_VERSION) $(TEST_FLAGS)  --exclude test/units/modules/network/
-
-.PHONY: integration
-integration:
-	$(ANSIBLE_TEST) integration -v --docker $(IMAGE) $(TARGET) $(TEST_FLAGS)
-
-.PHONY: authors
 authors:
 	sh hacking/authors.sh
 
-# Regenerate %.1.rst if %.1.rst.in has been modified more
-# recently than %.1.rst.
-%.1.rst: %.1.rst.in
+# Regenerate %.1.asciidoc if %.1.asciidoc.in has been modified more
+# recently than %.1.asciidoc.
+%.1.asciidoc: %.1.asciidoc.in
 	sed "s/%VERSION%/$(VERSION)/" $< > $@
-	rm $<
 
-# Regenerate %.1 if %.1.rst or release.py has been modified more
-# recently than %.1. (Implicitly runs the %.1.rst recipe)
-%.1: %.1.rst lib/ansible/release.py
+# Regenerate %.1 if %.1.asciidoc or VERSION has been modified more
+# recently than %.1. (Implicitly runs the %.1.asciidoc recipe)
+%.1: %.1.asciidoc VERSION
 	$(ASCII2MAN)
 
-.PHONY: loc
 loc:
 	sloccount lib library bin
 
-.PHONY: pep8
 pep8:
-	$(ANSIBLE_TEST) sanity --test pep8 --python $(PYTHON_VERSION) $(TEST_FLAGS)
+	@echo "#############################################"
+	@echo "# Running PEP8 Compliance Tests"
+	@echo "#############################################"
+	-pep8 -r --ignore=E501,E221,W291,W391,E302,E251,E203,W293,E231,E303,E201,E225,E261,E241 lib/ bin/
+	-pep8 -r --ignore=E501,E221,W291,W391,E302,E251,E203,W293,E231,E303,E201,E225,E261,E241 --filename "*" library/
 
-.PHONY: pyflakes
 pyflakes:
 	pyflakes lib/ansible/*.py lib/ansible/*/*.py bin/*
 
-.PHONY: clean
 clean:
 	@echo "Cleaning up distutils stuff"
 	rm -rf build
 	rm -rf dist
-	rm -rf lib/ansible.egg-info/
 	@echo "Cleaning up byte compiled python stuff"
 	find . -type f -regex ".*\.py[co]$$" -delete
-	find . -type d -name "__pycache__" -delete
 	@echo "Cleaning up editor backup files"
-	find . -type f -not -path ./test/units/inventory_test_data/group_vars/noparse/all.yml~ \( -name "*~" -or -name "#*" \) -delete
+	find . -type f \( -name "*~" -or -name "#*" \) -delete
 	find . -type f \( -name "*.swp" \) -delete
 	@echo "Cleaning up manpage stuff"
 	find ./docs/man -type f -name "*.xml" -delete
-	find ./docs/man -type f -name "*.rst" -delete
+	find ./docs/man -type f -name "*.asciidoc" -delete
 	find ./docs/man/man3 -type f -name "*.3" -delete
-	rm -f ./docs/man/man1/*
 	@echo "Cleaning up output from test runs"
 	rm -rf test/test_data
-	rm -rf shippable/
-	rm -rf logs/
-	rm -rf .cache/
-	rm -f test/units/.coverage*
-	rm -rf test/results/*/*
-	find test/ -type f -name '*.retry' -delete
 	@echo "Cleaning up RPM building stuff"
 	rm -rf MANIFEST rpm-build
 	@echo "Cleaning up Debian building stuff"
@@ -215,65 +114,21 @@ clean:
 	rm -rf docs/js
 	@echo "Cleaning up authors file"
 	rm -f AUTHORS.TXT
-	@echo "Cleaning up docsite"
-	$(MAKE) -C docs/docsite clean
-	$(MAKE) -C docs/api clean
 
-.PHONY: python
 python:
 	$(PYTHON) setup.py build
 
-.PHONY: install
 install:
 	$(PYTHON) setup.py install
 
-install_manpages:
-	gzip -9 $(wildcard ./docs/man/man1/ansible*.1)
-	cp $(wildcard ./docs/man/man1/ansible*.1.gz) $(PREFIX)/man/man1/
-
-.PHONY: sdist
 sdist: clean docs
 	$(PYTHON) setup.py sdist
 
-.PHONY: sdist_upload
-sdist_upload: clean docs
-	$(PYTHON) setup.py sdist upload 2>&1 |tee upload.log
-
-.PHONY: changelog
-changelog:
-	packaging/release/changelogs/changelog.py release -vv && packaging/release/changelogs/changelog.py generate -vv
-
-.PHONY: rpmcommon
-rpmcommon: sdist
+rpmcommon: $(MANPAGES) sdist
 	@mkdir -p rpm-build
 	@cp dist/*.gz rpm-build/
-	@cp $(RPMSPEC) rpm-build/$(NAME).spec
+	@sed -e 's#^Version:.*#Version: $(VERSION)#' -e 's#^Release:.*#Release: $(RPMRELEASE)%{?dist}#' $(RPMSPEC) >rpm-build/$(NAME).spec
 
-.PHONY: mock-srpm
-mock-srpm: /etc/mock/$(MOCK_CFG).cfg rpmcommon
-	$(MOCK_BIN) -r $(MOCK_CFG) $(MOCK_ARGS) --resultdir rpm-build/ --bootstrap-chroot --old-chroot --buildsrpm --spec rpm-build/$(NAME).spec --sources rpm-build/ \
-	--define "rpmversion $(RPMVERSION)" \
-	--define "upstream_version $(VERSION)" \
-	--define "rpmrelease $(RPMRELEASE)" \
-	$(EXTRA_RPM_DEFINES)
-	@echo "#############################################"
-	@echo "Ansible SRPM is built:"
-	@echo rpm-build/*.src.rpm
-	@echo "#############################################"
-
-.PHONY: mock-rpm
-mock-rpm: /etc/mock/$(MOCK_CFG).cfg mock-srpm
-	$(MOCK_BIN) -r $(MOCK_CFG) $(MOCK_ARGS) --resultdir rpm-build/ --bootstrap-chroot --old-chroot --rebuild rpm-build/$(NAME)-*.src.rpm \
-	--define "rpmversion $(RPMVERSION)" \
-	--define "upstream_version $(VERSION)" \
-	--define "rpmrelease $(RPMRELEASE)" \
-	$(EXTRA_RPM_DEFINES)
-	@echo "#############################################"
-	@echo "Ansible RPM is built:"
-	@echo rpm-build/*.noarch.rpm
-	@echo "#############################################"
-
-.PHONY: srpm
 srpm: rpmcommon
 	@rpmbuild --define "_topdir %(pwd)/rpm-build" \
 	--define "_builddir %{_topdir}" \
@@ -281,10 +136,6 @@ srpm: rpmcommon
 	--define "_srcrpmdir %{_topdir}" \
 	--define "_specdir $(RPMSPECDIR)" \
 	--define "_sourcedir %{_topdir}" \
-	--define "upstream_version $(VERSION)" \
-	--define "rpmversion $(RPMVERSION)" \
-	--define "rpmrelease $(RPMRELEASE)" \
-	$(EXTRA_RPM_DEFINES) \
 	-bs rpm-build/$(NAME).spec
 	@rm -f rpm-build/$(NAME).spec
 	@echo "#############################################"
@@ -292,7 +143,6 @@ srpm: rpmcommon
 	@echo "    rpm-build/$(RPMNVR).src.rpm"
 	@echo "#############################################"
 
-.PHONY: rpm
 rpm: rpmcommon
 	@rpmbuild --define "_topdir %(pwd)/rpm-build" \
 	--define "_builddir %{_topdir}" \
@@ -300,12 +150,8 @@ rpm: rpmcommon
 	--define "_srcrpmdir %{_topdir}" \
 	--define "_specdir $(RPMSPECDIR)" \
 	--define "_sourcedir %{_topdir}" \
-	--define "_rpmfilename $(RPMNVR).%%{ARCH}.rpm" \
+	--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
 	--define "__python `which $(PYTHON)`" \
-	--define "upstream_version $(VERSION)" \
-	--define "rpmversion $(RPMVERSION)" \
-	--define "rpmrelease $(RPMRELEASE)" \
-	$(EXTRA_RPM_DEFINES) \
 	-ba rpm-build/$(NAME).spec
 	@rm -f rpm-build/$(NAME).spec
 	@echo "#############################################"
@@ -313,89 +159,17 @@ rpm: rpmcommon
 	@echo "    rpm-build/$(RPMNVR).noarch.rpm"
 	@echo "#############################################"
 
-.PHONY: debian
 debian: sdist
-	@for DIST in $(DEB_DIST) ; do \
-	    mkdir -p deb-build/$${DIST} ; \
-	    tar -C deb-build/$${DIST} -xvf dist/$(NAME)-$(VERSION).tar.gz ; \
-	    cp -a packaging/debian deb-build/$${DIST}/$(NAME)-$(VERSION)/ ; \
-        sed -ie "s|%VERSION%|$(DEB_VERSION)|g;s|%RELEASE%|$(DEB_RELEASE)|;s|%DIST%|$${DIST}|g;s|%DATE%|$(DEB_DATE)|g" deb-build/$${DIST}/$(NAME)-$(VERSION)/debian/changelog ; \
-	done
-
-.PHONY: deb
-deb: deb-src
-	@for DIST in $(DEB_DIST) ; do \
-	    PBUILDER_OPTS="$(PBUILDER_OPTS) --distribution $${DIST} --basetgz $(PBUILDER_CACHE_DIR)/$${DIST}-$(PBUILDER_ARCH)-base.tgz --buildresult $(CURDIR)/deb-build/$${DIST}" ; \
-	    $(PBUILDER_BIN) create $${PBUILDER_OPTS} --othermirror "deb http://archive.ubuntu.com/ubuntu $${DIST} universe" ; \
-	    $(PBUILDER_BIN) update $${PBUILDER_OPTS} ; \
-	    $(PBUILDER_BIN) build $${PBUILDER_OPTS} deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}.dsc ; \
-	done
-	@echo "#############################################"
-	@echo "Ansible DEB artifacts:"
-	@for DIST in $(DEB_DIST) ; do \
-	    echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
-	done
-	@echo "#############################################"
-
-# Build package outside of pbuilder, with locally installed dependencies.
-# Install BuildRequires as noted in packaging/debian/control.
-.PHONY: local_deb
-local_deb: debian
-	@for DIST in $(DEB_DIST) ; do \
-	    (cd deb-build/$${DIST}/$(NAME)-$(VERSION)/ && $(DEBUILD) -b) ; \
-	done
-	@echo "#############################################"
-	@echo "Ansible DEB artifacts:"
-	@for DIST in $(DEB_DIST) ; do \
-	    echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
-	done
-	@echo "#############################################"
-
-.PHONY: deb-src
-deb-src: debian
-	@for DIST in $(DEB_DIST) ; do \
-	    (cd deb-build/$${DIST}/$(NAME)-$(VERSION)/ && $(DEBUILD) -S) ; \
-	done
-	@echo "#############################################"
-	@echo "Ansible DEB artifacts:"
-	@for DIST in $(DEB_DIST) ; do \
-	    echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \
-	done
-	@echo "#############################################"
-
-.PHONY: deb-upload
-deb-upload: deb
-	@for DIST in $(DEB_DIST) ; do \
-	    $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \
-	done
-
-.PHONY: deb-src-upload
-deb-src-upload: deb-src
-	@for DIST in $(DEB_DIST) ; do \
-	    $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \
-	done
-
-.PHONY: epub
-epub:
-	(cd docs/docsite/; CPUS=$(CPUS) $(MAKE) epub)
+deb: debian
+	cp -r packaging/debian ./
+	chmod 755 debian/rules
+	fakeroot debian/rules clean
+	fakeroot dh_install
+	fakeroot debian/rules binary
 
 # for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory
-.PHONY: webdocs
-webdocs:
-	(cd docs/docsite/; CPUS=$(CPUS) $(MAKE) docs)
 
-.PHONY: generate_rst
-generate_rst: lib/ansible/cli/*.py
-	mkdir -p ./docs/man/man1/ ; \
-	PYTHONPATH=./lib $(GENERATE_CLI) --template-file=docs/templates/man.j2 --output-dir=docs/man/man1/ --output-format man lib/ansible/cli/*.py
-
-
-docs: generate_rst
-	$(MAKE) $(MANPAGES)
-
-.PHONY: alldocs
-alldocs: docs webdocs
-
-version:
-	@echo $(VERSION)
+webdocs: $(MANPAGES)
+	(cd docsite/; make docs)
 
+docs: $(MANPAGES)

README.md

@@ -0,0 +1,48 @@
+[![PyPI version](https://badge.fury.io/py/ansible.png)](http://badge.fury.io/py/ansible) [![PyPI downloads](https://pypip.in/d/ansible/badge.png)](https://pypi.python.org/pypi/ansible)
+
+
+Ansible
+=======
+
+Ansible is a radically simple configuration-management, application deployment, task-execution, and multinode orchestration engine.
+
+Read the documentation and more at http://ansible.com/
+
+Many users run straight from the development branch (it's generally fine to do so), but you might also wish to consume a release.  You can find 
+instructions [here](http://docs.ansible.com/intro_getting_started.html) for a variety of platforms.  If you want a tarball of the last release, go to [releases.ansible.com](http://releases.ansible.com/ansible) and you can also install with pip.
+
+Design Principles
+=================
+
+   * Have a dead simple setup process and a minimal learning curve
+   * Be super fast & parallel by default
+   * Require no server or client daemons; use existing SSHd
+   * Use a language that is both machine and human friendly
+   * Focus on security and easy auditability/review/rewriting of content
+   * Manage remote machines instantly, without bootstrapping
+   * Allow module development in any dynamic language, not just Python
+   * Be usable as non-root
+   * Be the easiest IT automation system to use, ever.
+  
+Get Involved
+============
+
+   * Read [Contributing.md](https://github.com/ansible/ansible/blob/devel/CONTRIBUTING.md) for all kinds of ways to contribute to and interact with the project, including mailing list information and how to submit bug reports and code to Ansible.  
+   * All code submissions are done through pull requests.  Take care to make sure no merge commits are in the submission, and use "git rebase" vs "git merge" for this reason.  If submitting a large code change (other than modules), it's probably a good idea to join ansible-devel and talk about what you would like to do or add first and to avoid duplicate efforts.  This not only helps everyone know what's going on, it also helps save time and effort if we decide some changes are needed.
+   * irc.freenode.net: #ansible
+
+Branch Info
+===========
+
+   * Releases are named after Van Halen songs.
+   * The devel branch corresponds to the release actively under development.
+   * Various release-X.Y branches exist for previous releases
+   * We'd love to have your contributions, read "CONTRIBUTING.md" for process notes.
+
+Author
+======
+
+Michael DeHaan -- michael@ansible.com
+
+[Ansible, Inc](http://ansible.com)
+

README.rst

@@ -1,123 +0,0 @@
-|PyPI version| |Docs badge| |Build Status|
-
-*******
-Ansible
-*******
-
-Ansible is a radically simple IT automation system. It handles
-configuration-management, application deployment, cloud provisioning,
-ad-hoc task-execution, and multinode orchestration -- including
-trivializing things like zero-downtime rolling updates with load
-balancers.
-
-Read the documentation and more at https://ansible.com/
-
-You can find installation instructions
-`here <https://docs.ansible.com/intro_getting_started.html>`_ for a
-variety of platforms.
-
-Most users should probably install a released version of Ansible from ``pip``, a package manager or
-our `release repository <https://releases.ansible.com/ansible/>`_. `Officially supported
-<https://www.ansible.com/ansible-engine>`_ builds of Ansible are also available. Some power users
-run directly from the development branch - while significant efforts are made to ensure that
-``devel`` is reasonably stable, you're more likely to encounter breaking changes when running
-Ansible this way.
-
-Design Principles
-=================
-
-*  Have a dead simple setup process and a minimal learning curve
-*  Manage machines very quickly and in parallel
-*  Avoid custom-agents and additional open ports, be agentless by
-   leveraging the existing SSH daemon
-*  Describe infrastructure in a language that is both machine and human
-   friendly
-*  Focus on security and easy auditability/review/rewriting of content
-*  Manage new remote machines instantly, without bootstrapping any
-   software
-*  Allow module development in any dynamic language, not just Python
-*  Be usable as non-root
-*  Be the easiest IT automation system to use, ever.
-
-Get Involved
-============
-
-*  Read `Community
-   Information <https://docs.ansible.com/community.html>`_ for all
-   kinds of ways to contribute to and interact with the project,
-   including mailing list information and how to submit bug reports and
-   code to Ansible.
-*  All code submissions are done through pull requests. Take care to
-   make sure no merge commits are in the submission, and use
-   ``git rebase`` vs ``git merge`` for this reason. If submitting a
-   large code change (other than modules), it's probably a good idea to
-   join ansible-devel and talk about what you would like to do or add
-   first to avoid duplicate efforts. This not only helps everyone
-   know what's going on, it also helps save time and effort if we decide
-   some changes are needed.
-*  Users list:
-   `ansible-project <https://groups.google.com/group/ansible-project>`_
-*  Development list:
-   `ansible-devel <https://groups.google.com/group/ansible-devel>`_
-*  Announcement list:
-   `ansible-announce <https://groups.google.com/group/ansible-announce>`_
-   -- read only
-*  irc.freenode.net: #ansible
-
-Branch Info
-===========
-
-*  Releases are named after Led Zeppelin songs. (Releases prior to 2.0
-   were named after Van Halen songs.)
-*  The devel branch corresponds to the release actively under
-   development.
-*  Various release-X.Y branches exist for previous releases.
-*  We'd love to have your contributions, read `Community
-   Information <https://docs.ansible.com/community.html>`_ for notes on
-   how to get started.
-
-Roadmap
-=======
-
-Based on team and community feedback, an initial roadmap will be published for a major or minor version (ex: 2.0, 2.1).
-Subminor versions will generally not have roadmaps published.
-
-Ansible 2.1 was the first release which published this and asked for feedback in this manner.
-Feedback on the roadmap and the new process is quite welcome.
-The team is aiming for further transparency and better inclusion of both community desires and submissions.
-
-These are the team's *best guess* roadmaps based on the Ansible team's experience and are also based on requests and feedback from the community.
-There are things that may not make it due to time constraints, lack of community maintainers, etc.
-Each roadmap is published both as an idea of what is upcoming in Ansible, and as a medium for seeking further feedback from the community.
-
-There are multiple places for you to submit feedback:
-
-- Add to the agenda of an IRC `Core Team Meeting <https://github.com/ansible/community/blob/master/meetings/README.md>`_ (preferred)
-- Ansible's google-group: ansible-devel
-- AnsibleFest conferences
-- IRC Freenode channel: #ansible-devel (this one may have things lost in lots of conversation)
-
-For additional details consult the published `Ansible Roadmap <https://docs.ansible.com/ansible/devel/roadmap/>`_.
-
-Authors
-=======
-
-Ansible was created by `Michael DeHaan <https://github.com/mpdehaan>`_
-(michael.dehaan/gmail/com) and has contributions from over 1000 users
-(and growing). Thanks everyone!
-
-Ansible is sponsored by `Ansible, Inc <https://ansible.com>`_
-
-License
-=======
-
-GNU General Public License v3.0
-
-See `COPYING <COPYING>`_ to see the full text.
-
-.. |PyPI version| image:: https://img.shields.io/pypi/v/ansible.svg
-   :target: https://pypi.org/project/ansible
-.. |Docs badge| image:: https://img.shields.io/badge/docs-latest-brightgreen.svg
-   :target: https://docs.ansible.com/ansible
-.. |Build Status| image:: https://api.shippable.com/projects/573f79d02a8192902e20e34b/badge?branch=devel
-   :target: https://app.shippable.com/projects/573f79d02a8192902e20e34b

RELEASES.txt

@@ -0,0 +1,44 @@
+Ansible Releases at a Glance
+============================
+
+Active Development
+++++++++++++++++++
+
+1.7    "Summer Nights" -------- CURRENT DEVEL BRANCH
+
+1.6.1  "The Cradle Will Rock" - 05-07-2014
+1.6    "The Cradle Will Rock" - 05-05-2014
+1.5.5  "Love Walks In" -------- 04-18-2014
+1.5.4  "Love Walks In" -------- 04-01-2014
+1.5.3  "Love Walks In" -------- 03-13-2014
+1.5.2  "Love Walks In" -------- 03-11-2014
+1.5.1  "Love Walks In" -------- 03-10-2014
+1.5    "Love Walks In" -------- 02-28-2014
+1.4.5  "Could This Be Magic?" - 02-12-2014
+1.4.4  "Could This Be Magic?" - 01-06-2014
+1.4.3  "Could This Be Magic?" - 12-20-2013
+1.4.2  "Could This Be Magic?" - 12-18-2013
+1.4.1  "Could This Be Magic?" - 11-27-2013
+1.4    "Could This Be Magic?" - 11-21-2013
+1.3.4  "Top of the World" ----- 10-29-2013
+1.3.3  "Top of the World" ----- 10-09-2013
+1.3.2  "Top of the World" ----- 09-19-2013
+1.3.1  "Top of the World" ----- 09-16-2013
+1.3    "Top of the World" ----- 09-13-2013
+1.2.3  "Hear About It Later" -- 08-21-2013
+1.2.2  "Hear About It Later" -- 07-05-2013
+1.2.1  "Hear About It Later" -- 07-04-2013
+1.2    "Right Now" ------------ 06-10-2013
+1.1    "Mean Street" ---------- 04-02-2013
+1.0    "Eruption" ------------- 02-01-2013
+0.9    "Dreams" --------------- 11-30-2012
+0.8    "Cathedral" ------------ 10-19-2012
+0.7    "Panama" --------------- 09-06-2012
+0.6    "Cabo" ----------------- 08-06-2012
+0.5    "Amsterdam" ------------ 07-04-2012
+0.4    "Unchained" ------------ 05-23-2012
+0.3    "Baluchitherium" ------- 04-23-2012
+0.0.2  Untitled
+0.0.1  Untitled
+
+

VERSION

@@ -0,0 +1 @@
+1.6.1

bin/ansible

@@ -18,146 +18,214 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-__requires__ = ['ansible']
-try:
-    import pkg_resources
-except Exception:
-    # Use pkg_resources to find the correct versions of libraries and set
-    # sys.path appropriately when there are multiversion installs.  But we
-    # have code that better expresses the errors in the places where the code
-    # is actually used (the deps are optional for many code paths) so we don't
-    # want to fail here.
-    pass
 
 import os
-import shutil
 import sys
-import traceback
 
-from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError
-from ansible.module_utils._text import to_text
+from ansible.runner import Runner
+import ansible.constants as C
+from ansible import utils
+from ansible import errors
+from ansible import callbacks
+from ansible import inventory
+########################################################
+
+class Cli(object):
+    ''' code behind bin/ansible '''
+
+    # ----------------------------------------------
+
+    def __init__(self):
+        self.stats = callbacks.AggregateStats()
+        self.callbacks = callbacks.CliRunnerCallbacks()
+
+    # ----------------------------------------------
+
+    def parse(self):
+        ''' create an options parser for bin/ansible '''
+
+        parser = utils.base_parser(
+            constants=C, 
+            runas_opts=True, 
+            subset_opts=True, 
+            async_opts=True,
+            output_opts=True, 
+            connect_opts=True, 
+            check_opts=True,
+            diff_opts=False,
+            usage='%prog <host-pattern> [options]'
+        )
+
+        parser.add_option('-a', '--args', dest='module_args',
+            help="module arguments", default=C.DEFAULT_MODULE_ARGS)
+        parser.add_option('-m', '--module-name', dest='module_name',
+            help="module name to execute (default=%s)" % C.DEFAULT_MODULE_NAME,
+            default=C.DEFAULT_MODULE_NAME)
+
+        options, args = parser.parse_args()
+        self.callbacks.options = options
+
+        if len(args) == 0 or len(args) > 1:
+            parser.print_help()
+            sys.exit(1)
+
+        # su and sudo command line arguments need to be mutually exclusive
+        if (options.su or options.su_user or options.ask_su_pass) and \
+                (options.sudo or options.sudo_user or options.ask_sudo_pass):
+            parser.error("Sudo arguments ('--sudo', '--sudo-user', and '--ask-sudo-pass') "
+                         "and su arguments ('-su', '--su-user', and '--ask-su-pass') are "
+                         "mutually exclusive")
+
+        if (options.ask_vault_pass and options.vault_password_file):
+            parser.error("--ask-vault-pass and --vault-password-file are mutually exclusive")
+
+        return (options, args)
+
+    # ----------------------------------------------
+
+    def run(self, options, args):
+        ''' use Runner lib to do SSH things '''
+
+        pattern = args[0]
+
+        """
+        inventory_manager = inventory.Inventory(options.inventory)
+        if options.subset:
+            inventory_manager.subset(options.subset)
+        hosts = inventory_manager.list_hosts(pattern)
+        if len(hosts) == 0:
+            callbacks.display("No hosts matched")
+            sys.exit(0)
+
+        if options.listhosts:
+            for host in hosts:
+                callbacks.display('    %s' % host)
+            sys.exit(0)
+
+        if ((options.module_name == 'command' or options.module_name == 'shell')
+                and not options.module_args):
+            callbacks.display("No argument passed to %s module" % options.module_name, color='red', stderr=True)
+            sys.exit(1)
+        """
+
+        sshpass = None
+        sudopass = None
+        su_pass = None
+        vault_pass = None
+
+        options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
+        # Never ask for an SSH password when we run with local connection
+        if options.connection == "local":
+            options.ask_pass = False
+        options.ask_sudo_pass = options.ask_sudo_pass or C.DEFAULT_ASK_SUDO_PASS
+        options.ask_su_pass = options.ask_su_pass or C.DEFAULT_ASK_SU_PASS
+        options.ask_vault_pass = options.ask_vault_pass or C.DEFAULT_ASK_VAULT_PASS
+
+        (sshpass, sudopass, su_pass, vault_pass) = utils.ask_passwords(ask_pass=options.ask_pass, ask_sudo_pass=options.ask_sudo_pass, ask_su_pass=options.ask_su_pass, ask_vault_pass=options.ask_vault_pass)
+
+        # read vault_pass from a file
+        if options.vault_password_file:
+            this_path = os.path.expanduser(options.vault_password_file)
+            try:
+                f = open(this_path, "rb")
+                tmp_vault_pass=f.read().strip()
+                f.close()
+            except (OSError, IOError), e:
+                raise errors.AnsibleError("Could not read %s: %s" % (this_path, e))
+
+            if not options.ask_vault_pass:
+                vault_pass = tmp_vault_pass
+
+        inventory_manager = inventory.Inventory(options.inventory)
+        if options.subset:
+            inventory_manager.subset(options.subset)
+        hosts = inventory_manager.list_hosts(pattern)
+        if len(hosts) == 0:
+            callbacks.display("No hosts matched")
+            sys.exit(0)
+
+        if options.listhosts:
+            for host in hosts:
+                callbacks.display('    %s' % host)
+            sys.exit(0)
+
+        if ((options.module_name == 'command' or options.module_name == 'shell')
+                and not options.module_args):
+            callbacks.display("No argument passed to %s module" % options.module_name, color='red', stderr=True)
+            sys.exit(1)
 
 
-# Used for determining if the system is running a new enough python version
-# and should only restrict on our documented minimum versions
-_PY3_MIN = sys.version_info[:2] >= (3, 5)
-_PY2_MIN = (2, 6) <= sys.version_info[:2] < (3,)
-_PY_MIN = _PY3_MIN or _PY2_MIN
-if not _PY_MIN:
-    raise SystemExit('ERROR: Ansible requires a minimum of Python2 version 2.6 or Python3 version 3.5. Current version: %s' % ''.join(sys.version.splitlines()))
+        if options.su_user or options.ask_su_pass:
+            options.su = True
+        options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER
+        options.su_user = options.su_user or C.DEFAULT_SU_USER
+        if options.tree:
+            utils.prepare_writeable_dir(options.tree)
+
+        runner = Runner(
+            module_name=options.module_name,
+            module_path=options.module_path,
+            module_args=options.module_args,
+            remote_user=options.remote_user,
+            remote_pass=sshpass,
+            inventory=inventory_manager,
+            timeout=options.timeout,
+            private_key_file=options.private_key_file,
+            forks=options.forks,
+            pattern=pattern,
+            callbacks=self.callbacks,
+            sudo=options.sudo,
+            sudo_pass=sudopass,
+            sudo_user=options.sudo_user,
+            transport=options.connection,
+            subset=options.subset,
+            check=options.check,
+            diff=options.check,
+            su=options.su,
+            su_pass=su_pass,
+            su_user=options.su_user,
+            vault_pass=vault_pass
+        )
+
+        if options.seconds:
+            callbacks.display("background launch...\n\n", color='cyan')
+            results, poller = runner.run_async(options.seconds)
+            results = self.poll_while_needed(poller, options)
+        else:
+            results = runner.run()
+
+        return (runner, results)
+
+    # ----------------------------------------------
+
+    def poll_while_needed(self, poller, options):
+        ''' summarize results from Runner '''
+
+        # BACKGROUND POLL LOGIC when -B and -P are specified
+        if options.seconds and options.poll_interval > 0:
+            poller.wait(options.seconds, options.poll_interval)
+
+        return poller.results
 
 
-class LastResort(object):
-    # OUTPUT OF LAST RESORT
-    def display(self, msg, log_only=None):
-        print(msg, file=sys.stderr)
-
-    def error(self, msg, wrap_text=None):
-        print(msg, file=sys.stderr)
-
+########################################################
 
 if __name__ == '__main__':
+    callbacks.display("", log_only=True)
+    callbacks.display(" ".join(sys.argv), log_only=True)
+    callbacks.display("", log_only=True)
 
-    display = LastResort()
-
-    try:  # bad ANSIBLE_CONFIG or config options can force ugly stacktrace
-        import ansible.constants as C
-        from ansible.utils.display import Display
-    except AnsibleOptionsError as e:
-        display.error(to_text(e), wrap_text=False)
-        sys.exit(5)
-
-    cli = None
-    me = os.path.basename(sys.argv[0])
-
+    cli = Cli()
+    (options, args) = cli.parse()
     try:
-        display = Display()
-        display.debug("starting run")
+        (runner, results) = cli.run(options, args)
+        for result in results['contacted'].values():
+            if 'failed' in result or result.get('rc', 0) != 0:
+                sys.exit(2)
+        if results['dark']:
+            sys.exit(3)
+    except errors.AnsibleError, e:
+        # Generic handler for ansible specific errors
+        callbacks.display("ERROR: %s" % str(e), stderr=True, color='red')
+        sys.exit(1)
 
-        sub = None
-        target = me.split('-')
-        if target[-1][0].isdigit():
-            # Remove any version or python version info as downstreams
-            # sometimes add that
-            target = target[:-1]
-
-        if len(target) > 1:
-            sub = target[1]
-            myclass = "%sCLI" % sub.capitalize()
-        elif target[0] == 'ansible':
-            sub = 'adhoc'
-            myclass = 'AdHocCLI'
-        else:
-            raise AnsibleError("Unknown Ansible alias: %s" % me)
-
-        try:
-            mycli = getattr(__import__("ansible.cli.%s" % sub, fromlist=[myclass]), myclass)
-        except ImportError as e:
-            # ImportError members have changed in py3
-            if 'msg' in dir(e):
-                msg = e.msg
-            else:
-                msg = e.message
-            if msg.endswith(' %s' % sub):
-                raise AnsibleError("Ansible sub-program not implemented: %s" % me)
-            else:
-                raise
-
-        try:
-            args = [to_text(a, errors='surrogate_or_strict') for a in sys.argv]
-        except UnicodeError:
-            display.error('Command line args are not in utf-8, unable to continue.  Ansible currently only understands utf-8')
-            display.display(u"The full traceback was:\n\n%s" % to_text(traceback.format_exc()))
-            exit_code = 6
-        else:
-            cli = mycli(args)
-            cli.parse()
-            exit_code = cli.run()
-
-    except AnsibleOptionsError as e:
-        cli.parser.print_help()
-        display.error(to_text(e), wrap_text=False)
-        exit_code = 5
-    except AnsibleParserError as e:
-        display.error(to_text(e), wrap_text=False)
-        exit_code = 4
-# TQM takes care of these, but leaving comment to reserve the exit codes
-#    except AnsibleHostUnreachable as e:
-#        display.error(str(e))
-#        exit_code = 3
-#    except AnsibleHostFailed as e:
-#        display.error(str(e))
-#        exit_code = 2
-    except AnsibleError as e:
-        display.error(to_text(e), wrap_text=False)
-        exit_code = 1
-    except KeyboardInterrupt:
-        display.error("User interrupted execution")
-        exit_code = 99
-    except Exception as e:
-        if C.DEFAULT_DEBUG:
-            # Show raw stacktraces in debug mode, It also allow pdb to
-            # enter post mortem mode.
-            raise
-        have_cli_options = cli is not None and cli.options is not None
-        display.error("Unexpected Exception, this is probably a bug: %s" % to_text(e), wrap_text=False)
-        if not have_cli_options or have_cli_options and cli.options.verbosity > 2:
-            log_only = False
-            if hasattr(e, 'orig_exc'):
-                display.vvv('\nexception type: %s' % to_text(type(e.orig_exc)))
-                why = to_text(e.orig_exc)
-                if to_text(e) != why:
-                    display.vvv('\noriginal msg: %s' % why)
-        else:
-            display.display("to see the full traceback, use -vvv")
-            log_only = True
-        display.display(u"the full traceback was:\n\n%s" % to_text(traceback.format_exc()), log_only=log_only)
-        exit_code = 250
-    finally:
-        # Remove ansible tmpdir
-        shutil.rmtree(C.DEFAULT_LOCAL_TMP, True)
-
-    sys.exit(exit_code)

bin/ansible-config

@@ -1 +0,0 @@
-ansible

bin/ansible-connection

@@ -1,314 +0,0 @@
-#!/usr/bin/env python
-# Copyright: (c) 2017, Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-from __future__ import (absolute_import, division, print_function)
-
-__metaclass__ = type
-__requires__ = ['ansible']
-
-try:
-    import pkg_resources
-except Exception:
-    pass
-
-import fcntl
-import hashlib
-import os
-import signal
-import socket
-import sys
-import traceback
-import errno
-import json
-
-from contextlib import contextmanager
-
-from ansible import constants as C
-from ansible.module_utils._text import to_bytes, to_native, to_text
-from ansible.module_utils.six import PY3
-from ansible.module_utils.six.moves import cPickle, StringIO
-from ansible.module_utils.connection import Connection, ConnectionError, send_data, recv_data
-from ansible.module_utils.service import fork_process
-from ansible.playbook.play_context import PlayContext
-from ansible.plugins.loader import connection_loader
-from ansible.utils.path import unfrackpath, makedirs_safe
-from ansible.utils.display import Display
-from ansible.utils.jsonrpc import JsonRpcServer
-
-
-def read_stream(byte_stream):
-    size = int(byte_stream.readline().strip())
-
-    data = byte_stream.read(size)
-    if len(data) < size:
-        raise Exception("EOF found before data was complete")
-
-    data_hash = to_text(byte_stream.readline().strip())
-    if data_hash != hashlib.sha1(data).hexdigest():
-        raise Exception("Read {0} bytes, but data did not match checksum".format(size))
-
-    # restore escaped loose \r characters
-    data = data.replace(br'\r', b'\r')
-
-    return data
-
-
-@contextmanager
-def file_lock(lock_path):
-    """
-    Uses contextmanager to create and release a file lock based on the
-    given path. This allows us to create locks using `with file_lock()`
-    to prevent deadlocks related to failure to unlock properly.
-    """
-
-    lock_fd = os.open(lock_path, os.O_RDWR | os.O_CREAT, 0o600)
-    fcntl.lockf(lock_fd, fcntl.LOCK_EX)
-    yield
-    fcntl.lockf(lock_fd, fcntl.LOCK_UN)
-    os.close(lock_fd)
-
-
-class ConnectionProcess(object):
-    '''
-    The connection process wraps around a Connection object that manages
-    the connection to a remote device that persists over the playbook
-    '''
-    def __init__(self, fd, play_context, socket_path, original_path, ansible_playbook_pid=None):
-        self.play_context = play_context
-        self.socket_path = socket_path
-        self.original_path = original_path
-
-        self.fd = fd
-        self.exception = None
-
-        self.srv = JsonRpcServer()
-        self.sock = None
-
-        self.connection = None
-        self._ansible_playbook_pid = ansible_playbook_pid
-
-    def start(self, variables):
-        try:
-            messages = list()
-            result = {}
-
-            messages.append('control socket path is %s' % self.socket_path)
-
-            # If this is a relative path (~ gets expanded later) then plug the
-            # key's path on to the directory we originally came from, so we can
-            # find it now that our cwd is /
-            if self.play_context.private_key_file and self.play_context.private_key_file[0] not in '~/':
-                self.play_context.private_key_file = os.path.join(self.original_path, self.play_context.private_key_file)
-            self.connection = connection_loader.get(self.play_context.connection, self.play_context, '/dev/null',
-                                                    ansible_playbook_pid=self._ansible_playbook_pid)
-            self.connection.set_options(var_options=variables)
-            self.connection._connect()
-            self.connection._socket_path = self.socket_path
-            self.srv.register(self.connection)
-            messages.extend(sys.stdout.getvalue().splitlines())
-            messages.append('connection to remote device started successfully')
-
-            self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            self.sock.bind(self.socket_path)
-            self.sock.listen(1)
-            messages.append('local domain socket listeners started successfully')
-        except Exception as exc:
-            result['error'] = to_text(exc)
-            result['exception'] = traceback.format_exc()
-        finally:
-            result['messages'] = messages
-            self.fd.write(json.dumps(result))
-            self.fd.close()
-
-    def run(self):
-        try:
-            while self.connection.connected:
-                signal.signal(signal.SIGALRM, self.connect_timeout)
-                signal.signal(signal.SIGTERM, self.handler)
-                signal.alarm(self.connection.get_option('persistent_connect_timeout'))
-
-                self.exception = None
-                (s, addr) = self.sock.accept()
-                signal.alarm(0)
-
-                signal.signal(signal.SIGALRM, self.command_timeout)
-                while True:
-                    data = recv_data(s)
-                    if not data:
-                        break
-
-                    signal.alarm(self.connection._play_context.timeout)
-                    resp = self.srv.handle_request(data)
-                    signal.alarm(0)
-
-                    send_data(s, to_bytes(resp))
-
-                s.close()
-
-        except Exception as e:
-            # socket.accept() will raise EINTR if the socket.close() is called
-            if hasattr(e, 'errno'):
-                if e.errno != errno.EINTR:
-                    self.exception = traceback.format_exc()
-            else:
-                self.exception = traceback.format_exc()
-
-        finally:
-            # when done, close the connection properly and cleanup
-            # the socket file so it can be recreated
-            self.shutdown()
-
-    def connect_timeout(self, signum, frame):
-        display.display('persistent connection idle timeout triggered, timeout value is %s secs'
-                        % self.connection.get_option('persistent_connect_timeout'), log_only=True)
-        self.shutdown()
-
-    def command_timeout(self, signum, frame):
-        display.display('command timeout triggered, timeout value is %s secs' % self.play_context.timeout, log_only=True)
-        self.shutdown()
-
-    def handler(self, signum, frame):
-        display.display('signal handler called with signal %s' % signum, log_only=True)
-        self.shutdown()
-
-    def shutdown(self):
-        """ Shuts down the local domain socket
-        """
-        if os.path.exists(self.socket_path):
-            try:
-                if self.sock:
-                    self.sock.close()
-                if self.connection:
-                    self.connection.close()
-            except:
-                pass
-            finally:
-                if os.path.exists(self.socket_path):
-                    os.remove(self.socket_path)
-                    setattr(self.connection, '_socket_path', None)
-                    setattr(self.connection, '_connected', False)
-        display.display('shutdown complete', log_only=True)
-
-
-def main():
-    """ Called to initiate the connect to the remote device
-    """
-    rc = 0
-    result = {}
-    messages = list()
-    socket_path = None
-
-    # Need stdin as a byte stream
-    if PY3:
-        stdin = sys.stdin.buffer
-    else:
-        stdin = sys.stdin
-
-    # Note: update the below log capture code after Display.display() is refactored.
-    saved_stdout = sys.stdout
-    sys.stdout = StringIO()
-
-    try:
-        # read the play context data via stdin, which means depickling it
-        vars_data = read_stream(stdin)
-        init_data = read_stream(stdin)
-
-        if PY3:
-            pc_data = cPickle.loads(init_data, encoding='bytes')
-            variables = cPickle.loads(vars_data, encoding='bytes')
-        else:
-            pc_data = cPickle.loads(init_data)
-            variables = cPickle.loads(vars_data)
-
-        play_context = PlayContext()
-        play_context.deserialize(pc_data)
-        display.verbosity = play_context.verbosity
-
-    except Exception as e:
-        rc = 1
-        result.update({
-            'error': to_text(e),
-            'exception': traceback.format_exc()
-        })
-
-    if rc == 0:
-        ssh = connection_loader.get('ssh', class_only=True)
-        ansible_playbook_pid = sys.argv[1]
-        cp = ssh._create_control_path(play_context.remote_addr, play_context.port, play_context.remote_user, play_context.connection, ansible_playbook_pid)
-
-        # create the persistent connection dir if need be and create the paths
-        # which we will be using later
-        tmp_path = unfrackpath(C.PERSISTENT_CONTROL_PATH_DIR)
-        makedirs_safe(tmp_path)
-
-        lock_path = unfrackpath("%s/.ansible_pc_lock_%s" % (tmp_path, play_context.remote_addr))
-        socket_path = unfrackpath(cp % dict(directory=tmp_path))
-
-        with file_lock(lock_path):
-            if not os.path.exists(socket_path):
-                messages.append('local domain socket does not exist, starting it')
-                original_path = os.getcwd()
-                r, w = os.pipe()
-                pid = fork_process()
-
-                if pid == 0:
-                    try:
-                        os.close(r)
-                        wfd = os.fdopen(w, 'w')
-                        process = ConnectionProcess(wfd, play_context, socket_path, original_path, ansible_playbook_pid)
-                        process.start(variables)
-                    except Exception:
-                        messages.append(traceback.format_exc())
-                        rc = 1
-
-                    if rc == 0:
-                        process.run()
-                    else:
-                        process.shutdown()
-
-                    sys.exit(rc)
-
-                else:
-                    os.close(w)
-                    rfd = os.fdopen(r, 'r')
-                    data = json.loads(rfd.read())
-                    messages.extend(data.pop('messages'))
-                    result.update(data)
-
-            else:
-                messages.append('found existing local domain socket, using it!')
-                conn = Connection(socket_path)
-                pc_data = to_text(init_data)
-                try:
-                    messages.extend(conn.update_play_context(pc_data))
-                except Exception as exc:
-                    # Only network_cli has update_play context, so missing this is
-                    # not fatal e.g. netconf
-                    if isinstance(exc, ConnectionError) and getattr(exc, 'code', None) == -32601:
-                        pass
-                    else:
-                        result.update({
-                            'error': to_text(exc),
-                            'exception': traceback.format_exc()
-                        })
-
-    messages.append(sys.stdout.getvalue())
-    result.update({
-        'messages': messages,
-        'socket_path': socket_path
-    })
-
-    sys.stdout = saved_stdout
-    if 'exception' in result:
-        rc = 1
-        sys.stderr.write(json.dumps(result))
-    else:
-        rc = 0
-        sys.stdout.write(json.dumps(result))
-
-    sys.exit(rc)
-
-
-if __name__ == '__main__':
-    display = Display()
-    main()

bin/ansible-console

@@ -1 +0,0 @@
-ansible

bin/ansible-doc

@@ -1 +0,0 @@
-ansible

bin/ansible-doc

@@ -0,0 +1,291 @@
+#!/usr/bin/env python
+
+# (c) 2012, Jan-Piet Mens <jpmens () gmail.com>
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+import sys
+import textwrap
+import re
+import optparse
+import datetime
+import subprocess
+from ansible import utils
+from ansible.utils import module_docs
+import ansible.constants as C
+from ansible.utils import version
+import traceback
+
+MODULEDIR = C.DEFAULT_MODULE_PATH
+
+BLACKLIST_EXTS = ('.swp', '.bak', '~', '.rpm')
+
+_ITALIC = re.compile(r"I\(([^)]+)\)")
+_BOLD   = re.compile(r"B\(([^)]+)\)")
+_MODULE = re.compile(r"M\(([^)]+)\)")
+_URL    = re.compile(r"U\(([^)]+)\)")
+_CONST  = re.compile(r"C\(([^)]+)\)")
+PAGER   = 'less'
+LESS_OPTS = 'FRSX' # -F (quit-if-one-screen) -R (allow raw ansi control chars)
+                   # -S (chop long lines) -X (disable termcap init and de-init)
+
+def pager_print(text):
+    ''' just print text '''
+    print text
+
+def pager_pipe(text, cmd):
+    ''' pipe text through a pager '''
+    if 'LESS' not in os.environ:
+        os.environ['LESS'] = LESS_OPTS
+    try:
+        cmd = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, stdout=sys.stdout)
+        cmd.communicate(input=text)
+    except IOError:
+        pass
+    except KeyboardInterrupt:
+        pass
+
+def pager(text):
+    ''' find reasonable way to display text '''
+    # this is a much simpler form of what is in pydoc.py
+    if not sys.stdout.isatty():
+        pager_print(text)
+    elif 'PAGER' in os.environ:
+        if sys.platform == 'win32':
+            pager_print(text)
+        else:
+            pager_pipe(text, os.environ['PAGER'])
+    elif hasattr(os, 'system') and os.system('(less) 2> /dev/null') == 0:
+        pager_pipe(text, 'less')
+    else:
+        pager_print(text)
+
+def tty_ify(text):
+
+    t = _ITALIC.sub("`" + r"\1" + "'", text)    # I(word) => `word'
+    t = _BOLD.sub("*" + r"\1" + "*", t)         # B(word) => *word*
+    t = _MODULE.sub("[" + r"\1" + "]", t)       # M(word) => [word]
+    t = _URL.sub(r"\1", t)                      # U(word) => word
+    t = _CONST.sub("`" + r"\1" + "'", t)        # C(word) => `word'
+
+    return t
+
+def get_man_text(doc):
+
+    opt_indent="        "
+    text = []
+    text.append("> %s\n" % doc['module'].upper())
+
+    desc = "".join(doc['description'])
+
+    text.append("%s\n" % textwrap.fill(tty_ify(desc), initial_indent="  ", subsequent_indent="  "))
+    
+    if 'option_keys' in doc and len(doc['option_keys']) > 0:
+        text.append("Options (= is mandatory):\n")
+
+    for o in sorted(doc['option_keys']):
+        opt = doc['options'][o]
+
+        if opt.get('required', False):
+            opt_leadin = "="
+        else:
+            opt_leadin = "-"
+
+        text.append("%s %s" % (opt_leadin, o))
+
+        desc = "".join(opt['description'])
+
+        if 'choices' in opt:
+            choices = ", ".join(str(i) for i in opt['choices'])
+            desc = desc + " (Choices: " + choices + ")"
+        text.append("%s\n" % textwrap.fill(tty_ify(desc), initial_indent=opt_indent,
+                             subsequent_indent=opt_indent))
+
+    if 'notes' in doc and len(doc['notes']) > 0:
+        notes = "".join(doc['notes'])
+        text.append("Notes:%s\n" % textwrap.fill(tty_ify(notes), initial_indent="  ",
+                            subsequent_indent=opt_indent))
+
+
+    if 'requirements' in doc and doc['requirements'] is not None and len(doc['requirements']) > 0:
+        req = ", ".join(doc['requirements'])
+        text.append("Requirements:%s\n" % textwrap.fill(tty_ify(req), initial_indent="  ",
+                            subsequent_indent=opt_indent))
+
+    if 'examples' in doc and len(doc['examples']) > 0:
+        text.append("Example%s:\n" % ('' if len(doc['examples']) < 2 else 's'))
+        for ex in doc['examples']:
+            text.append("%s\n" % (ex['code']))
+
+    if 'plainexamples' in doc and doc['plainexamples'] is not None:
+        text.append(doc['plainexamples'])
+    text.append('')
+
+    return "\n".join(text)
+
+
+def get_snippet_text(doc):
+
+    text = []
+    desc = tty_ify("".join(doc['short_description']))
+    text.append("- name: %s" % (desc))
+    text.append("  action: %s" % (doc['module']))
+
+    for o in sorted(doc['options'].keys()):
+        opt = doc['options'][o]
+        desc = tty_ify("".join(opt['description']))
+
+        if opt.get('required', False):
+            s = o + "="
+        else:
+            s = o
+
+        text.append("      %-20s   # %s" % (s, desc))
+    text.append('')
+
+    return "\n".join(text)
+
+def get_module_list_text(module_list):
+    text = []
+    for module in sorted(set(module_list)):
+
+        if module in module_docs.BLACKLIST_MODULES:
+            continue
+
+        filename = utils.plugins.module_finder.find_plugin(module)
+
+        if filename is None:
+            continue
+        if os.path.isdir(filename):
+            continue
+
+        try:
+            doc, plainexamples = module_docs.get_docstring(filename)
+            desc = tty_ify(doc.get('short_description', '?'))
+            if len(desc) > 55:
+                desc = desc + '...'
+            text.append("%-20s %-60.60s" % (module, desc))
+        except:
+            traceback.print_exc()
+            sys.stderr.write("ERROR: module %s has a documentation error formatting or is missing documentation\n" % module)
+            pass
+    return "\n".join(text)
+
+def main():
+
+    p = optparse.OptionParser(
+        version=version("%prog"),
+        usage='usage: %prog [options] [module...]',
+        description='Show Ansible module documentation',
+    )
+
+    p.add_option("-M", "--module-path",
+            action="store",
+            dest="module_path",
+            default=MODULEDIR,
+            help="Ansible modules/ directory")
+    p.add_option("-l", "--list",
+            action="store_true",
+            default=False,
+            dest='list_dir',
+            help='List available modules')
+    p.add_option("-s", "--snippet",
+            action="store_true",
+            default=False,
+            dest='show_snippet',
+            help='Show playbook snippet for specified module(s)')
+    p.add_option('-v', action='version', help='Show version number and exit')
+
+    (options, args) = p.parse_args()
+
+    if options.module_path is not None:
+        for i in options.module_path.split(os.pathsep):
+            utils.plugins.module_finder.add_directory(i)
+
+    if options.list_dir:
+        # list all modules
+        paths = utils.plugins.module_finder._get_paths()
+        module_list = []
+        for path in paths:
+            # os.system("ls -C %s" % (path))
+            if os.path.isdir(path):
+                for module in os.listdir(path):
+                    if any(module.endswith(x) for x in BLACKLIST_EXTS):
+                        continue
+                    module_list.append(module)
+
+        pager(get_module_list_text(module_list))
+        sys.exit()
+
+    if len(args) == 0:
+        p.print_help()
+   
+    def print_paths(finder):
+        ''' Returns a string suitable for printing of the search path '''
+
+        # Uses a list to get the order right
+        ret = []
+        for i in finder._get_paths():
+            if i not in ret:
+                ret.append(i)
+        return os.pathsep.join(ret)
+ 
+    text = ''
+    for module in args:
+
+        filename = utils.plugins.module_finder.find_plugin(module)
+        if filename is None:
+            sys.stderr.write("module %s not found in %s\n" % (module,
+                    print_paths(utils.plugins.module_finder)))
+            continue
+
+        if any(filename.endswith(x) for x in BLACKLIST_EXTS):
+            continue
+
+        try:
+            doc, plainexamples = module_docs.get_docstring(filename)
+        except:
+            traceback.print_exc()
+            sys.stderr.write("ERROR: module %s has a documentation error formatting or is missing documentation\n" % module)
+            continue
+
+        if doc is not None:
+
+            all_keys = []
+            for (k,v) in doc['options'].iteritems():
+                all_keys.append(k)
+            all_keys = sorted(all_keys)
+            doc['option_keys'] = all_keys
+
+            doc['filename']         = filename
+            doc['docuri']           = doc['module'].replace('_', '-')
+            doc['now_date']         = datetime.date.today().strftime('%Y-%m-%d')
+            doc['plainexamples']    = plainexamples
+
+            if options.show_snippet:
+                text += get_snippet_text(doc)
+            else:
+                text += get_man_text(doc)
+        else:
+            # this typically means we couldn't even parse the docstring, not just that the YAML is busted,
+            # probably a quoting issue.
+            sys.stderr.write("ERROR: module %s missing documentation (or could not parse documentation)\n" % module)
+    pager(text)
+
+if __name__ == '__main__':
+    main()

bin/ansible-galaxy

@@ -1 +0,0 @@
-ansible

bin/ansible-galaxy

@@ -0,0 +1,814 @@
+#!/usr/bin/env python
+
+########################################################################
+#
+# (C) 2013, James Cammarata <jcammarata@ansible.com>
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+#
+########################################################################
+
+import datetime
+import json
+import os
+import os.path
+import shutil
+import sys
+import tarfile
+import tempfile
+import urllib
+import urllib2
+import yaml
+
+from collections import defaultdict
+from distutils.version import LooseVersion
+from jinja2 import Environment
+from optparse import OptionParser
+
+import ansible.constants as C
+
+default_meta_template = """---
+galaxy_info:
+  author: {{ author }}
+  description: {{description}}
+  company: {{ company }}
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: {{ license }}
+  min_ansible_version: {{ min_ansible_version }}
+  #
+  # Below are all platforms currently available. Just uncomment
+  # the ones that apply to your role. If you don't see your 
+  # platform on this list, let us know and we'll get it added!
+  #
+  #platforms:
+  {%- for platform,versions in platforms.iteritems() %}
+  #- name: {{ platform }}
+  #  versions:
+  #  - all
+    {%- for version in versions %}
+  #  - {{ version }}
+    {%- endfor %}
+  {%- endfor %}
+  #
+  # Below are all categories currently available. Just as with
+  # the platforms above, uncomment those that apply to your role.
+  #
+  #categories:
+  {%- for category in categories %}
+  #- {{ category.name }}
+  {%- endfor %}
+dependencies: []
+  # List your role dependencies here, one per line. Only
+  # dependencies available via galaxy should be listed here.
+  # Be sure to remove the '[]' above if you add dependencies
+  # to this list.
+  {% for dependency in dependencies %}
+  #- {{ dependency }}
+  {% endfor %}
+
+"""
+
+default_readme_template = """Role Name
+========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+-------------------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
+"""
+
+#-------------------------------------------------------------------------------------
+# Utility functions for parsing actions/options
+#-------------------------------------------------------------------------------------
+
+VALID_ACTIONS = ("init", "info", "install", "list", "remove")
+
+def get_action(args):
+    """
+    Get the action the user wants to execute from the 
+    sys argv list.
+    """
+    for i in range(0,len(args)):
+        arg = args[i]
+        if arg in VALID_ACTIONS:
+            del args[i]
+            return arg
+    return None
+
+def build_option_parser(action):
+    """
+    Builds an option parser object based on the action
+    the user wants to execute.
+    """
+
+    usage = "usage: %%prog [%s] [--help] [options] ..." % "|".join(VALID_ACTIONS)
+    epilog = "\nSee '%s <command> --help' for more information on a specific command.\n\n" % os.path.basename(sys.argv[0])
+    OptionParser.format_epilog = lambda self, formatter: self.epilog
+    parser = OptionParser(usage=usage, epilog=epilog)
+
+    if not action:
+        parser.print_help()
+        sys.exit()
+
+    # options for all actions
+    # - none yet
+
+    # options specific to actions
+    if action == "info":
+        parser.set_usage("usage: %prog info [options] role_name[,version]")
+    elif action == "init":
+        parser.set_usage("usage: %prog init [options] role_name")
+        parser.add_option(
+            '-p', '--init-path', dest='init_path', default="./",
+            help='The path in which the skeleton role will be created. '
+                 'The default is the current working directory.')
+    elif action == "install":
+        parser.set_usage("usage: %prog install [options] [-r FILE | role_name(s)[,version] | tar_file(s)]")
+        parser.add_option(
+            '-i', '--ignore-errors', dest='ignore_errors', action='store_true', default=False,
+            help='Ignore errors and continue with the next specified role.')
+        parser.add_option(
+            '-n', '--no-deps', dest='no_deps', action='store_true', default=False,
+            help='Don\'t download roles listed as dependencies')
+        parser.add_option(
+            '-r', '--role-file', dest='role_file',
+            help='A file containing a list of roles to be imported')
+    elif action == "remove":
+        parser.set_usage("usage: %prog remove role1 role2 ...")
+    elif action == "list":
+        parser.set_usage("usage: %prog list [role_name]")
+        
+    # options that apply to more than one action
+    if action != "init":
+        parser.add_option(
+            '-p', '--roles-path', dest='roles_path', default=C.DEFAULT_ROLES_PATH,
+            help='The path to the directory containing your roles. '
+                 'The default is the roles_path configured in your '
+                 'ansible.cfg file (/etc/ansible/roles if not configured)')
+
+    if action in ("info","init","install"):
+        parser.add_option(
+            '-s', '--server', dest='api_server', default="galaxy.ansible.com",
+            help='The API server destination')
+
+    if action in ("init","install"):
+        parser.add_option(
+            '-f', '--force', dest='force', action='store_true', default=False,
+            help='Force overwriting an existing role')
+    # done, return the parser
+    return parser
+
+def get_opt(options, k, defval=""):
+    """
+    Returns an option from an Optparse values instance.
+    """
+    try:
+        data = getattr(options, k)
+    except:
+        return defval
+    if k == "roles_path":
+        if os.pathsep in data:
+            data = data.split(os.pathsep)[0]
+    return data
+
+def exit_without_ignore(options, rc=1):
+    """
+    Exits with the specified return code unless the 
+    option --ignore-errors was specified
+    """
+
+    if not get_opt(options, "ignore_errors", False):
+        print 'You can use --ignore-errors to skip failed roles.'
+        sys.exit(rc)
+
+#-------------------------------------------------------------------------------------
+# Galaxy API functions
+#-------------------------------------------------------------------------------------
+
+def api_get_config(api_server):
+    """
+    Fetches the Galaxy API current version to ensure
+    the API server is up and reachable.
+    """
+
+    try:
+        url = 'https://%s/api/' % api_server
+        data = json.load(urllib2.urlopen(url))
+        if not data.get("current_version",None):
+            return None
+        else:
+            return data
+    except:
+        return None
+
+def api_lookup_role_by_name(api_server, role_name):
+    """
+    Uses the Galaxy API to do a lookup on the role owner/name.
+    """
+
+    role_name = urllib.quote(role_name)
+
+    try:
+        parts = role_name.split(".")
+        user_name = ".".join(parts[0:-1])
+        role_name = parts[-1]
+        print " downloading role '%s', owned by %s" % (role_name, user_name)
+    except:
+        parser.print_help()
+        print "Invalid role name (%s). You must specify username.rolename" % role_name
+        sys.exit(1)
+
+    url = 'https://%s/api/v1/roles/?owner__username=%s&name=%s' % (api_server,user_name,role_name)
+    try:
+        data = json.load(urllib2.urlopen(url))
+        if len(data["results"]) == 0:
+            return None
+        else:
+            return data["results"][0]
+    except:
+        return None
+
+def api_fetch_role_related(api_server, related, role_id):
+    """
+    Uses the Galaxy API to fetch the list of related items for
+    the given role. The url comes from the 'related' field of 
+    the role. 
+    """
+
+    try:
+        url = 'https://%s/api/v1/roles/%d/%s/?page_size=50' % (api_server, int(role_id), related)
+        data = json.load(urllib2.urlopen(url))
+        results = data['results']
+        done = (data.get('next', None) == None)
+        while not done:
+            url = 'https://%s%s' % (api_server, data['next'])
+            print url
+            data = json.load(urllib2.urlopen(url))
+            results += data['results']
+            done = (data.get('next', None) == None)
+        return results
+    except:
+        return None
+
+def api_get_list(api_server, what):
+    """
+    Uses the Galaxy API to fetch the list of items specified.
+    """
+
+    try:
+        url = 'https://%s/api/v1/%s/?page_size' % (api_server, what)
+        data = json.load(urllib2.urlopen(url))
+        if "results" in data:
+            results = data['results']
+        else:
+            results = data
+        done = True
+        if "next" in data:
+            done = (data.get('next', None) == None)
+        while not done:
+            url = 'https://%s%s' % (api_server, data['next'])
+            print url
+            data = json.load(urllib2.urlopen(url))
+            results += data['results']
+            done = (data.get('next', None) == None)
+        return results
+    except:
+        print " - failed to download the %s list" % what
+        return None
+
+#-------------------------------------------------------------------------------------
+# Role utility functions
+#-------------------------------------------------------------------------------------
+
+def get_role_path(role_name, options):
+    """
+    Returns the role path based on the roles_path option
+    and the role name.
+    """
+    roles_path = get_opt(options,'roles_path')
+    roles_path = os.path.join(roles_path, role_name)
+    roles_path = os.path.expanduser(roles_path)
+    return roles_path
+
+def get_role_metadata(role_name, options):
+    """
+    Returns the metadata as YAML, if the file 'meta/main.yml'
+    exists in the specified role_path
+    """
+    role_path = os.path.join(get_role_path(role_name, options), 'meta/main.yml')
+    try:
+        if os.path.isfile(role_path):
+            f = open(role_path, 'r')
+            meta_data = yaml.safe_load(f)
+            f.close()
+            return meta_data
+        else:
+            return None
+    except:
+        return None    
+
+def get_galaxy_install_info(role_name, options):
+    """
+    Returns the YAML data contained in 'meta/.galaxy_install_info',
+    if it exists.
+    """
+
+    try:
+        info_path = os.path.join(get_role_path(role_name, options), 'meta/.galaxy_install_info')
+        if os.path.isfile(info_path):
+            f = open(info_path, 'r')
+            info_data = yaml.safe_load(f)
+            f.close()
+            return info_data
+        else:
+            return None
+    except:
+        return None    
+
+def write_galaxy_install_info(role_name, role_version, options):
+    """
+    Writes a YAML-formatted file to the role's meta/ directory
+    (named .galaxy_install_info) which contains some information
+    we can use later for commands like 'list' and 'info'.
+    """
+
+    info = dict(
+        version = role_version,
+        install_date = datetime.datetime.utcnow().strftime("%c"),
+    )
+    try:
+        info_path = os.path.join(get_role_path(role_name, options), 'meta/.galaxy_install_info')
+        f = open(info_path, 'w+')
+        info_data = yaml.safe_dump(info, f)
+        f.close()
+    except:
+        return False
+    return True
+
+
+def remove_role(role_name, options):
+    """
+    Removes the specified role from the roles path. There is a
+    sanity check to make sure there's a meta/main.yml file at this 
+    path so the user doesn't blow away random directories 
+    """
+    if get_role_metadata(role_name, options):
+        role_path = get_role_path(role_name, options)
+        shutil.rmtree(role_path)
+        return True
+    else:
+        return False
+
+def fetch_role(role_name, target, role_data, options):
+    """
+    Downloads the archived role from github to a temp location, extracts
+    it, and then copies the extracted role to the role library path.
+    """
+
+    # first grab the file and save it to a temp location
+    archive_url = 'https://github.com/%s/%s/archive/%s.tar.gz' % (role_data["github_user"], role_data["github_repo"], target)
+    print " - downloading role from %s" % archive_url
+
+    try:
+        url_file = urllib2.urlopen(archive_url)
+        temp_file = tempfile.NamedTemporaryFile(delete=False)
+        data = url_file.read()
+        while data:
+            temp_file.write(data)
+            data = url_file.read()
+        temp_file.close()
+        return temp_file.name
+    except Exception, e:
+        # TODO: better urllib2 error handling for error 
+        #       messages that are more exact
+        print "Error: failed to download the file."
+        return False
+
+def install_role(role_name, role_version, role_filename, options):
+    # the file is a tar, so open it that way and extract it
+    # to the specified (or default) roles directory
+    if not tarfile.is_tarfile(role_filename):
+        print "Error: the file downloaded was not a tar.gz"
+        return False
+    else:
+        role_tar_file = tarfile.open(role_filename, "r:gz")
+        # verify the role's meta file
+        meta_file = None
+        members = role_tar_file.getmembers()
+        for member in members:
+            if "/meta/main.yml" in member.name:
+                meta_file = member
+                break
+        if not meta_file:
+            print "Error: this role does not appear to have a meta/main.yml file."
+            return False
+        else:
+            try:
+                meta_file_data = yaml.safe_load(role_tar_file.extractfile(meta_file))
+            except:
+                print "Error: this role does not appear to have a valid meta/main.yml file."
+                return False
+
+        # we strip off the top-level directory for all of the files contained within
+        # the tar file here, since the default is 'github_repo-target', and change it 
+        # to the specified role's name
+        role_path = os.path.join(get_opt(options, 'roles_path', '/etc/ansible/roles'), role_name)
+        role_path = os.path.expanduser(role_path)
+        print " - extracting %s to %s" % (role_name, role_path)
+        try:
+            if os.path.exists(role_path):
+                if not os.path.isdir(role_path):
+                    print "Error: the specified roles path exists and is not a directory."
+                    return False
+                elif not get_opt(options, "force", False):
+                    print "Error: the specified role %s appears to already exist. Use --force to replace it." % role_name
+                    return False
+                else:
+                    # using --force, remove the old path
+                    if not remove_role(role_name, options):
+                        print "Error: %s doesn't appear to contain a role." % role_path
+                        print "Please remove this directory manually if you really want to put the role here."
+                        return False
+            else:
+                os.makedirs(role_path)
+
+            # now we do the actual extraction to the role_path
+            for member in members:
+                # we only extract files
+                if member.isreg():
+                    member.name = "/".join(member.name.split("/")[1:])
+                    role_tar_file.extract(member, role_path)
+
+            # write out the install info file for later use
+            write_galaxy_install_info(role_name, role_version, options)
+        except OSError, e:
+            print "Error: you do not have permission to modify files in %s" % role_path
+            return False
+
+        # return the parsed yaml metadata
+        print "%s was installed successfully" % role_name
+        return meta_file_data
+
+#-------------------------------------------------------------------------------------
+# Action functions
+#-------------------------------------------------------------------------------------
+
+def execute_init(args, options, parser):
+    """
+    Executes the init action, which creates the skeleton framework
+    of a role that complies with the galaxy metadata format.
+    """
+
+    init_path  = get_opt(options, 'init_path', './')
+    api_server = get_opt(options, "api_server", "galaxy.ansible.com")
+    force      = get_opt(options, 'force', False)
+
+    api_config = api_get_config(api_server)
+    if not api_config:
+        print "The API server (%s) is not responding, please try again later." % api_server
+        sys.exit(1)
+
+    try:
+        role_name = args.pop(0).strip()
+        if role_name == "":
+            raise Exception("")
+        role_path = os.path.join(init_path, role_name)
+        if os.path.exists(role_path):
+            if os.path.isfile(role_path):
+                print "The path %s already exists, but is a file - aborting" % role_path
+                sys.exit(1)
+            elif not force:
+                print "The directory %s already exists." % role_path
+                print ""
+                print "You can use --force to re-initialize this directory,\n" + \
+                      "however it will reset any main.yml files that may have\n" + \
+                      "been modified there already."
+                sys.exit(1)
+    except Exception, e:
+        parser.print_help()
+        print "No role name specified for init"
+        sys.exit(1)
+
+    ROLE_DIRS = ('defaults','files','handlers','meta','tasks','templates','vars')
+
+    # create the default README.md
+    if not os.path.exists(role_path):
+        os.makedirs(role_path)
+    readme_path = os.path.join(role_path, "README.md")
+    f = open(readme_path, "wb")
+    f.write(default_readme_template)
+    f.close
+
+    for dir in ROLE_DIRS:
+        dir_path = os.path.join(init_path, role_name, dir)
+        main_yml_path = os.path.join(dir_path, 'main.yml')
+        # create the directory if it doesn't exist already
+        if not os.path.exists(dir_path):
+            os.makedirs(dir_path)
+
+        # now create the main.yml file for that directory
+        if dir == "meta":
+            # create a skeleton meta/main.yml with a valid galaxy_info 
+            # datastructure in place, plus with all of the available 
+            # tags/platforms included (but commented out) and the 
+            # dependencies section
+            platforms = api_get_list(api_server, "platforms")
+            if not platforms:
+                platforms = []
+            categories = api_get_list(api_server, "categories")
+            if not categories:
+                categories = []
+            
+            # group the list of platforms from the api based
+            # on their names, with the release field being 
+            # appended to a list of versions
+            platform_groups = defaultdict(list)
+            for platform in platforms:
+                platform_groups[platform['name']].append(platform['release'])
+                platform_groups[platform['name']].sort()
+
+            inject = dict(
+                author = 'your name',
+                company = 'your company (optional)',
+                license = 'license (GPLv2, CC-BY, etc)',
+                min_ansible_version = '1.2',
+                platforms = platform_groups,
+                categories = categories,
+            )
+            rendered_meta = Environment().from_string(default_meta_template).render(inject)
+            f = open(main_yml_path, 'w')
+            f.write(rendered_meta)
+            f.close()
+            pass
+        elif dir not in ('files','templates'):
+            # just write a (mostly) empty YAML file for main.yml
+            f = open(main_yml_path, 'w')
+            f.write('---\n# %s file for %s\n' % (dir,role_name))
+            f.close()
+    print "%s was created successfully" % role_name
+
+def execute_info(args, options, parser):
+    """
+    Executes the info action. This action prints out detailed
+    information about an installed role as well as info available
+    from the galaxy API.
+    """
+
+    pass
+
+def execute_install(args, options, parser):
+    """
+    Executes the installation action. The args list contains the 
+    roles to be installed, unless -f was specified. The list of roles
+    can be a name (which will be downloaded via the galaxy API and github),
+    or it can be a local .tar.gz file.
+    """
+
+    role_file  = get_opt(options, "role_file", None)
+    api_server = get_opt(options, "api_server", "galaxy.ansible.com")
+    no_deps    = get_opt(options, "no_deps", False)
+
+    if len(args) == 0 and not role_file:
+        # the user needs to specify one of either --role-file
+        # or specify a single user/role name
+        parser.print_help()
+        print "You must specify a user/role name or a roles file"
+        sys.exit()
+    elif len(args) == 1 and role_file:
+        # using a role file is mutually exclusive of specifying
+        # the role name on the command line
+        parser.print_help()
+        print "Please specify a user/role name, or a roles file, but not both"
+        sys.exit(1)
+
+    api_config = api_get_config(api_server)
+    if not api_config:
+        print "The API server (%s) is not responding, please try again later." % api_server
+        sys.exit(1)
+
+    roles_done = []
+    if role_file:
+        # roles listed in a file, one per line
+        # so we'll go through and grab them all
+        f = open(role_file, 'r')
+        roles_left = f.readlines()
+        f.close()
+    else:
+        # roles were specified directly, so we'll just go out grab them
+        # (and their dependencies, unless the user doesn't want us to).
+        roles_left = args
+
+    while len(roles_left) > 0:
+        # query the galaxy API for the role data
+        role_name = roles_left.pop(0).strip()
+        role_version = None
+
+        if role_name == "" or role_name.startswith("#"):
+            continue
+        elif ',' in role_name:
+            role_name,role_version = role_name.split(',',1)
+            role_name = role_name.strip()
+            role_version = role_version.strip()
+
+        if os.path.isfile(role_name):
+            # installing a local tar.gz
+            tar_file = role_name
+            role_name = os.path.basename(role_name).replace('.tar.gz','')
+            if tarfile.is_tarfile(tar_file):
+                print " - installing %s as %s" % (tar_file, role_name)
+                if not install_role(role_name, role_version, tar_file, options):
+                    exit_without_ignore(options)
+            else:
+                print "%s (%s) was NOT installed successfully." % (role_name,tar_file)
+                exit_without_ignore(options)
+        else:
+            # installing remotely
+            role_data = api_lookup_role_by_name(api_server, role_name)
+            if not role_data:
+                print "Sorry, %s was not found on %s." % (role_name, api_server)
+                continue
+
+            role_versions = api_fetch_role_related(api_server, 'versions', role_data['id'])
+            if not role_version: 
+                # convert the version names to LooseVersion objects
+                # and sort them to get the latest version. If there
+                # are no versions in the list, we'll grab the head 
+                # of the master branch
+                if len(role_versions) > 0:
+                    loose_versions = [LooseVersion(a.get('name',None)) for a in role_versions]
+                    loose_versions.sort()
+                    role_version = str(loose_versions[-1])
+                else:
+                    role_version = 'master'
+                print " no version specified, installing %s" % role_version
+            else:
+                if role_versions and role_version not in [a.get('name',None) for a in role_versions]:
+                    print "The specified version (%s) was not found in the list of available versions." % role_version
+                    exit_without_ignore(options)
+                    continue
+
+            # download the role. if --no-deps was specified, we stop here, 
+            # otherwise we recursively grab roles and all of their deps.
+            tmp_file = fetch_role(role_name, role_version, role_data, options)
+            if tmp_file and install_role(role_name, role_version, tmp_file, options):
+                # we're done with the temp file, clean it up
+                os.unlink(tmp_file)
+                # install dependencies, if we want them
+                if not no_deps:
+                    role_dependencies = role_data['summary_fields']['dependencies'] # api_fetch_role_related(api_server, 'dependencies', role_data['id'])
+                    for dep_name in role_dependencies:
+                        #dep_name = "%s.%s" % (dep['owner'], dep['name'])
+                        if not get_role_metadata(dep_name, options):
+                            print ' adding dependency: %s' % dep_name
+                            roles_left.append(dep_name)
+                        else:
+                            print ' dependency %s is already installed, skipping.' % dep_name
+            else:
+                if tmp_file:
+                    os.unlink(tmp_file)
+                print "%s was NOT installed successfully." % role_name
+                exit_without_ignore(options)
+    sys.exit(0)
+
+def execute_remove(args, options, parser):
+    """
+    Executes the remove action. The args list contains the list
+    of roles to be removed. This list can contain more than one role.
+    """
+
+    if len(args) == 0:
+        parser.print_help()
+        print 'You must specify at least one role to remove.'
+        sys.exit()
+
+    for role in args:
+        if get_role_metadata(role, options):
+            if remove_role(role, options):
+                print 'successfully removed %s' % role
+            else:
+                print "failed to remove role: %s" % role
+        else:
+            print '%s is not installed, skipping.' % role
+    sys.exit(0)
+
+def execute_list(args, options, parser):
+    """
+    Executes the list action. The args list can contain zero 
+    or one role. If one is specified, only that role will be 
+    shown, otherwise all roles in the specified directory will
+    be shown.
+    """
+
+    if len(args) > 1:
+        print "Please specify only one role to list, or specify no roles to see a full list"
+        sys.exit(1)
+
+    if len(args) == 1:
+        # show only the request role, if it exists
+        role_name = args[0]
+        metadata = get_role_metadata(role_name, options)
+        if metadata:
+            install_info = get_galaxy_install_info(role_name, options)
+            version = None
+            if install_info:
+                version = install_info.get("version", None)
+            if not version:
+                version = "(unknown version)"
+            # show some more info about single roles here
+            print " %s, %s" % (role_name, version)
+        else:
+            print "The role %s was not found" % role_name
+    else:
+        # show all valid roles in the roles_path directory
+        roles_path = get_opt(options, 'roles_path')
+        roles_path = os.path.expanduser(roles_path)
+        if not os.path.exists(roles_path):
+            parser.print_help()
+            print "The path %s does not exist. Please specify a valid path with --roles-path" % roles_path
+            sys.exit(1)
+        elif not os.path.isdir(roles_path):
+            print "%s exists, but it is not a directory. Please specify a valid path with --roles-path" % roles_path
+            parser.print_help()
+            sys.exit(1)
+        path_files = os.listdir(roles_path)
+        for path_file in path_files:
+            if get_role_metadata(path_file, options):
+                install_info = get_galaxy_install_info(path_file, options)
+                version = None
+                if install_info:
+                    version = install_info.get("version", None)
+                if not version:
+                    version = "(unknown version)"
+                print " %s, %s" % (path_file, version)
+    sys.exit(0)
+
+#-------------------------------------------------------------------------------------
+# The main entry point
+#-------------------------------------------------------------------------------------
+
+def main():
+    # parse the CLI options
+    action = get_action(sys.argv)
+    parser = build_option_parser(action)
+    (options, args) = parser.parse_args()
+
+    # execute the desired action
+    if 1: #try:
+        fn = globals()["execute_%s" % action]
+        fn(args, options, parser)
+    #except KeyError, e:
+    #    print "Error: %s is not a valid action. Valid actions are: %s" % (action, ", ".join(VALID_ACTIONS))
+    #    sys.exit(1)
+
+if __name__ == "__main__":
+    main()

bin/ansible-inventory

@@ -1 +0,0 @@
-ansible

bin/ansible-playbook

@@ -1 +0,0 @@
-ansible

bin/ansible-playbook

@@ -0,0 +1,324 @@
+#!/usr/bin/env python
+# (C) 2012, Michael DeHaan, <michael.dehaan@gmail.com>
+
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+#######################################################
+
+#__requires__ = ['ansible']
+#import pkg_resources
+
+import sys
+import os
+import stat
+
+import ansible.playbook
+import ansible.constants as C
+import ansible.utils.template
+from ansible import errors
+from ansible import callbacks
+from ansible import utils
+from ansible.color import ANSIBLE_COLOR, stringc
+from ansible.callbacks import display
+
+def colorize(lead, num, color):
+    """ Print 'lead' = 'num' in 'color' """
+    if num != 0 and ANSIBLE_COLOR and color is not None:
+        return "%s%s%-15s" % (stringc(lead, color), stringc("=", color), stringc(str(num), color))
+    else:
+        return "%s=%-4s" % (lead, str(num))
+
+def hostcolor(host, stats, color=True):
+    if ANSIBLE_COLOR and color:
+        if stats['failures'] != 0 or stats['unreachable'] != 0:
+            return "%-37s" % stringc(host, 'red')
+        elif stats['changed'] != 0:
+            return "%-37s" % stringc(host, 'yellow')
+        else:
+            return "%-37s" % stringc(host, 'green')
+    return "%-26s" % host
+
+
+def main(args):
+    ''' run ansible-playbook operations '''
+
+    # create parser for CLI options
+    parser = utils.base_parser(
+        constants=C,
+        usage = "%prog playbook.yml",
+        connect_opts=True,
+        runas_opts=True,
+        subset_opts=True,
+        check_opts=True,
+        diff_opts=True
+    )
+    #parser.add_option('--vault-password', dest="vault_password",
+    #    help="password for vault encrypted files")
+    parser.add_option('-e', '--extra-vars', dest="extra_vars", action="append",
+        help="set additional variables as key=value or YAML/JSON", default=[])
+    parser.add_option('-t', '--tags', dest='tags', default='all',
+        help="only run plays and tasks tagged with these values")
+    parser.add_option('--skip-tags', dest='skip_tags',
+        help="only run plays and tasks whose tags do not match these values")
+    parser.add_option('--syntax-check', dest='syntax', action='store_true',
+        help="perform a syntax check on the playbook, but do not execute it")
+    parser.add_option('--list-tasks', dest='listtasks', action='store_true',
+        help="list all tasks that would be executed")
+    parser.add_option('--step', dest='step', action='store_true',
+        help="one-step-at-a-time: confirm each task before running")
+    parser.add_option('--start-at-task', dest='start_at',
+        help="start the playbook at the task matching this name")
+    parser.add_option('--force-handlers', dest='force_handlers', action='store_true',
+        help="run handlers even if a task fails")
+
+    options, args = parser.parse_args(args)
+
+    if len(args) == 0:
+        parser.print_help(file=sys.stderr)
+        return 1
+
+    # su and sudo command line arguments need to be mutually exclusive
+    if (options.su or options.su_user or options.ask_su_pass) and \
+                (options.sudo or options.sudo_user or options.ask_sudo_pass):
+            parser.error("Sudo arguments ('--sudo', '--sudo-user', and '--ask-sudo-pass') "
+                         "and su arguments ('-su', '--su-user', and '--ask-su-pass') are "
+                         "mutually exclusive")
+
+    if (options.ask_vault_pass and options.vault_password_file):
+            parser.error("--ask-vault-pass and --vault-password-file are mutually exclusive")
+
+    inventory = ansible.inventory.Inventory(options.inventory)
+    inventory.subset(options.subset)
+    if len(inventory.list_hosts()) == 0:
+        raise errors.AnsibleError("provided hosts list is empty")
+
+    sshpass = None
+    sudopass = None
+    su_pass = None
+    vault_pass = None
+
+    if not options.listhosts and not options.syntax and not options.listtasks:
+        options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
+        options.ask_vault_pass = options.ask_vault_pass or C.DEFAULT_ASK_VAULT_PASS
+        # Never ask for an SSH password when we run with local connection
+        if options.connection == "local":
+            options.ask_pass = False
+        options.ask_sudo_pass = options.ask_sudo_pass or C.DEFAULT_ASK_SUDO_PASS
+        options.ask_su_pass = options.ask_su_pass or C.DEFAULT_ASK_SU_PASS
+        options.ask_vault_pass = options.ask_vault_pass or C.DEFAULT_ASK_VAULT_PASS
+        (sshpass, sudopass, su_pass, vault_pass) = utils.ask_passwords(ask_pass=options.ask_pass, ask_sudo_pass=options.ask_sudo_pass, ask_su_pass=options.ask_su_pass, ask_vault_pass=options.ask_vault_pass)
+        options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER
+        options.su_user = options.su_user or C.DEFAULT_SU_USER
+
+        if options.vault_password_file:
+            this_path = os.path.expanduser(options.vault_password_file)
+            try:
+                f = open(this_path, "rb")
+                tmp_vault_pass=f.read().strip()
+                f.close()
+            except (OSError, IOError), e:
+                raise errors.AnsibleError("Could not read %s: %s" % (this_path, e))
+
+            if not options.ask_vault_pass:
+                vault_pass = tmp_vault_pass
+
+    extra_vars = {}
+    for extra_vars_opt in options.extra_vars:
+        if extra_vars_opt.startswith("@"):
+            # Argument is a YAML file (JSON is a subset of YAML)
+            extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml_from_file(extra_vars_opt[1:], vault_password=vault_pass))
+        elif extra_vars_opt and extra_vars_opt[0] in '[{':
+            # Arguments as YAML
+            extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml(extra_vars_opt))
+        else:
+            # Arguments as Key-value
+            extra_vars = utils.combine_vars(extra_vars, utils.parse_kv(extra_vars_opt))
+
+    only_tags = options.tags.split(",")
+    skip_tags = options.skip_tags
+    if options.skip_tags is not None:
+        skip_tags = options.skip_tags.split(",")
+
+    for playbook in args:
+        if not os.path.exists(playbook):
+            raise errors.AnsibleError("the playbook: %s could not be found" % playbook)
+        if not (os.path.isfile(playbook) or stat.S_ISFIFO(os.stat(playbook).st_mode)):
+            raise errors.AnsibleError("the playbook: %s does not appear to be a file" % playbook)
+
+    # run all playbooks specified on the command line
+    for playbook in args:
+
+        # let inventory know which playbooks are using so it can know the basedirs
+        inventory.set_playbook_basedir(os.path.dirname(playbook))
+
+        stats = callbacks.AggregateStats()
+        playbook_cb = callbacks.PlaybookCallbacks(verbose=utils.VERBOSITY)
+        if options.step:
+            playbook_cb.step = options.step
+        if options.start_at:
+            playbook_cb.start_at = options.start_at
+        runner_cb = callbacks.PlaybookRunnerCallbacks(stats, verbose=utils.VERBOSITY)
+
+        pb = ansible.playbook.PlayBook(
+            playbook=playbook,
+            module_path=options.module_path,
+            inventory=inventory,
+            forks=options.forks,
+            remote_user=options.remote_user,
+            remote_pass=sshpass,
+            callbacks=playbook_cb,
+            runner_callbacks=runner_cb,
+            stats=stats,
+            timeout=options.timeout,
+            transport=options.connection,
+            sudo=options.sudo,
+            sudo_user=options.sudo_user,
+            sudo_pass=sudopass,
+            extra_vars=extra_vars,
+            private_key_file=options.private_key_file,
+            only_tags=only_tags,
+            skip_tags=skip_tags,
+            check=options.check,
+            diff=options.diff,
+            su=options.su,
+            su_pass=su_pass,
+            su_user=options.su_user,
+            vault_password=vault_pass,
+            force_handlers=options.force_handlers
+        )
+
+        if options.listhosts or options.listtasks or options.syntax:
+            print ''
+            print 'playbook: %s' % playbook
+            print ''
+            playnum = 0
+            for (play_ds, play_basedir) in zip(pb.playbook, pb.play_basedirs):
+                playnum += 1
+                play = ansible.playbook.Play(pb, play_ds, play_basedir)
+                label = play.name
+                hosts = pb.inventory.list_hosts(play.hosts)
+
+                # Filter all tasks by given tags
+                if pb.only_tags != 'all':
+                    if options.subset and not hosts:
+                        continue
+                    matched_tags, unmatched_tags = play.compare_tags(pb.only_tags)
+
+                    # Remove skipped tasks
+                    matched_tags = matched_tags - set(pb.skip_tags)
+
+                    unmatched_tags.discard('all')
+                    unknown_tags = ((set(pb.only_tags) | set(pb.skip_tags)) -
+                                    (matched_tags | unmatched_tags))
+
+                    if unknown_tags:
+                        continue
+
+                if options.listhosts:
+                    print '  play #%d (%s): host count=%d' % (playnum, label, len(hosts))
+                    for host in hosts:
+                        print '    %s' % host
+
+                if options.listtasks:
+                    print '  play #%d (%s):' % (playnum, label)
+
+                    for task in play.tasks():
+                        if (set(task.tags).intersection(pb.only_tags) and not
+                            set(task.tags).intersection(pb.skip_tags)):
+                            if getattr(task, 'name', None) is not None:
+                                # meta tasks have no names
+                                print '    %s' % task.name
+                print ''
+            continue
+
+        if options.syntax:
+            # if we've not exited by now then we are fine.
+            print 'Playbook Syntax is fine'
+            return 0
+
+        failed_hosts = []
+        unreachable_hosts = []
+
+        try:
+
+            pb.run()
+
+            hosts = sorted(pb.stats.processed.keys())
+            display(callbacks.banner("PLAY RECAP"))
+            playbook_cb.on_stats(pb.stats)
+
+            for h in hosts:
+                t = pb.stats.summarize(h)
+                if t['failures'] > 0:
+                    failed_hosts.append(h)
+                if t['unreachable'] > 0:
+                    unreachable_hosts.append(h)
+
+            retries = failed_hosts + unreachable_hosts
+
+            if len(retries) > 0:
+                filename = pb.generate_retry_inventory(retries)
+                if filename:
+                    display("           to retry, use: --limit @%s\n" % filename)
+
+            for h in hosts:
+                t = pb.stats.summarize(h)
+
+                display("%s : %s %s %s %s" % (
+                    hostcolor(h, t),
+                    colorize('ok', t['ok'], 'green'),
+                    colorize('changed', t['changed'], 'yellow'),
+                    colorize('unreachable', t['unreachable'], 'red'),
+                    colorize('failed', t['failures'], 'red')),
+                    screen_only=True
+                )
+
+                display("%s : %s %s %s %s" % (
+                    hostcolor(h, t, False),
+                    colorize('ok', t['ok'], None),
+                    colorize('changed', t['changed'], None),
+                    colorize('unreachable', t['unreachable'], None),
+                    colorize('failed', t['failures'], None)),
+                    log_only=True
+                )
+
+
+            print ""
+            if len(failed_hosts) > 0:
+                return 2
+            if len(unreachable_hosts) > 0:
+                return 3
+
+        except errors.AnsibleError, e:
+            display("ERROR: %s" % e, color='red')
+            return 1
+
+    return 0
+
+
+if __name__ == "__main__":
+    display(" ", log_only=True)
+    display(" ".join(sys.argv), log_only=True)
+    display(" ", log_only=True)
+    try:
+        sys.exit(main(sys.argv[1:]))
+    except errors.AnsibleError, e:
+        display("ERROR: %s" % e, color='red', stderr=True)
+        sys.exit(1)
+    except KeyboardInterrupt, ke:
+        display("ERROR: interrupted", color='red', stderr=True)
+        sys.exit(1)
+

bin/ansible-pull

@@ -1 +0,0 @@
-ansible

bin/ansible-pull

@@ -0,0 +1,230 @@
+#!/usr/bin/env python
+
+# (c) 2012, Stephen Fromm <sfromm@gmail.com>
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ansible-pull is a script that runs ansible in local mode
+# after checking out a playbooks directory from source repo.  There is an
+# example playbook to bootstrap this script in the examples/ dir which
+# installs ansible and sets it up to run on cron.
+
+# usage:
+#   ansible-pull -d /var/lib/ansible \
+#                -U http://example.net/content.git [-C production] \
+#                [path/playbook.yml]
+#
+# the -d and -U arguments are required; the -C argument is optional.
+#
+# ansible-pull accepts an optional argument to specify a playbook
+# location underneath the workdir and then searches the source repo
+# for playbooks in the following order, stopping at the first match:
+#
+# 1. $workdir/path/playbook.yml, if specified
+# 2. $workdir/$fqdn.yml
+# 3. $workdir/$hostname.yml
+# 4. $workdir/local.yml
+#
+# the source repo must contain at least one of these playbooks.
+
+import os
+import shutil
+import subprocess
+import sys
+import datetime
+import socket
+import random
+import time
+from ansible import utils
+from ansible.utils import cmd_functions
+from ansible import errors
+
+DEFAULT_REPO_TYPE = 'git'
+DEFAULT_PLAYBOOK = 'local.yml'
+PLAYBOOK_ERRORS = {1: 'File does not exist',
+                    2: 'File is not readable'}
+
+VERBOSITY=0
+
+def increment_debug(option, opt, value, parser):
+    global VERBOSITY
+    VERBOSITY += 1
+
+def try_playbook(path):
+    if not os.path.exists(path):
+        return 1
+    if not os.access(path, os.R_OK):
+        return 2
+    return 0
+
+
+def select_playbook(path, args):
+    playbook = None
+    if len(args) > 0 and args[0] is not None:
+        playbook = "%s/%s" % (path, args[0])
+        rc = try_playbook(playbook)
+        if rc != 0:
+            print >>sys.stderr, "%s: %s" % (playbook, PLAYBOOK_ERRORS[rc])
+            return None
+        return playbook
+    else:
+        fqdn = socket.getfqdn()
+        hostpb = "%s/%s.yml" % (path, fqdn)
+        shorthostpb = "%s/%s.yml" % (path, fqdn.split('.')[0])
+        localpb = "%s/%s" % (path, DEFAULT_PLAYBOOK)
+        errors = []
+        for pb in [hostpb, shorthostpb, localpb]:
+            rc = try_playbook(pb)
+            if rc == 0:
+                playbook = pb
+                break
+            else:
+                errors.append("%s: %s" % (pb, PLAYBOOK_ERRORS[rc]))
+        if playbook is None:
+            print >>sys.stderr, "\n".join(errors)
+        return playbook
+
+
+def main(args):
+    """ Set up and run a local playbook """
+    usage = "%prog [options] [playbook.yml]"
+    parser = utils.SortedOptParser(usage=usage)
+    parser.add_option('--purge', default=False, action='store_true',
+                      help='purge checkout after playbook run')
+    parser.add_option('-o', '--only-if-changed', dest='ifchanged', default=False, action='store_true',
+                      help='only run the playbook if the repository has been updated')
+    parser.add_option('-s', '--sleep', dest='sleep', default=None,
+                      help='sleep for random interval (between 0 and n number of seconds) before starting. this is a useful way to disperse git requests')
+    parser.add_option('-f', '--force', dest='force', default=False,
+                      action='store_true',
+                      help='run the playbook even if the repository could '
+                           'not be updated')
+    parser.add_option('-d', '--directory', dest='dest', default=None,
+                      help='directory to checkout repository to')
+    #parser.add_option('-l', '--live', default=True, action='store_live',
+    #                  help='Print the ansible-playbook output while running')
+    parser.add_option('-U', '--url', dest='url', default=None,
+                      help='URL of the playbook repository')
+    parser.add_option('-C', '--checkout', dest='checkout',
+                      help='branch/tag/commit to checkout.  '
+                      'Defaults to behavior of repository module.')
+    parser.add_option('-i', '--inventory-file', dest='inventory',
+                      help="location of the inventory host file")
+    parser.add_option('-e', '--extra-vars', dest="extra_vars", action="append",
+                      help="set additional variables as key=value or YAML/JSON", default=[])
+    parser.add_option('-v', '--verbose', default=False, action="callback",
+                      callback=increment_debug,
+                      help='Pass -vvvv to ansible-playbook')
+    parser.add_option('-m', '--module-name', dest='module_name',
+                      default=DEFAULT_REPO_TYPE,
+                      help='Module name used to check out repository.  '
+                      'Default is %s.' % DEFAULT_REPO_TYPE)
+    parser.add_option('--vault-password-file', dest='vault_password_file',
+                    help="vault password file")
+    parser.add_option('-K', '--ask-sudo-pass', default=False, dest='ask_sudo_pass', action='store_true',
+                      help='ask for sudo password')
+    options, args = parser.parse_args(args)
+
+    hostname = socket.getfqdn()
+    if not options.dest:
+        # use a hostname dependent directory, in case of $HOME on nfs
+        options.dest = utils.prepare_writeable_dir('~/.ansible/pull/%s' % hostname)
+
+    options.dest = os.path.abspath(options.dest)
+
+    if not options.url:
+        parser.error("URL for repository not specified, use -h for help")
+        return 1
+
+    now = datetime.datetime.now()
+    print >>sys.stderr, now.strftime("Starting ansible-pull at %F %T")
+
+    inv_opts = 'localhost,'
+    limit_opts = 'localhost:%s:127.0.0.1' % hostname
+    repo_opts = "name=%s dest=%s" % (options.url, options.dest)
+
+    if VERBOSITY == 0:
+        base_opts = '-c local --limit "%s"' % limit_opts
+    elif VERBOSITY > 0:
+        debug_level = ''.join([ "v" for x in range(0, VERBOSITY) ])
+        base_opts = '-%s -c local --limit "%s"' % (debug_level, limit_opts)
+
+    if options.checkout:
+        repo_opts += ' version=%s' % options.checkout
+    path = utils.plugins.module_finder.find_plugin(options.module_name)
+    if path is None:
+        sys.stderr.write("module '%s' not found.\n" % options.module_name)
+        return 1
+    cmd = 'ansible all -i "%s" %s -m %s -a "%s"' % (
+            inv_opts, base_opts, options.module_name, repo_opts
+            )
+
+    if options.sleep:
+        try:
+            secs = random.randint(0,int(options.sleep));
+        except ValueError:
+            parser.error("%s is not a number." % options.sleep)
+            return 1
+
+        print >>sys.stderr, "Sleeping for %d seconds..." % secs
+        time.sleep(secs);
+
+
+    # RUN THe CHECKOUT COMMAND
+    rc, out, err = cmd_functions.run_cmd(cmd, live=True)
+
+    if rc != 0:
+        if options.force:
+            print "Unable to update repository. Continuing with (forced) run of playbook."
+        else:
+            return rc
+    elif options.ifchanged and '"changed": true' not in out:
+        print "Repository has not changed, quitting."
+        return 0
+
+    playbook = select_playbook(options.dest, args)
+
+    if playbook is None:
+        print >>sys.stderr, "Could not find a playbook to run."
+        return 1
+
+    cmd = 'ansible-playbook %s %s' % (base_opts, playbook)
+    if options.vault_password_file:
+        cmd += " --vault-password-file=%s" % options.vault_password_file
+    if options.inventory:
+        cmd += ' -i "%s"' % options.inventory
+    for ev in options.extra_vars:
+        cmd += ' -e "%s"' % ev
+    if options.ask_sudo_pass:
+        cmd += ' -K'
+    os.chdir(options.dest)
+
+    # RUN THE PLAYBOOK COMMAND
+    rc, out, err = cmd_functions.run_cmd(cmd, live=True)
+
+    if options.purge:
+        os.chdir('/')
+        try:
+            shutil.rmtree(options.dest)
+        except Exception, e:
+            print >>sys.stderr, "Failed to remove %s: %s" % (options.dest, str(e))
+
+    return rc
+
+if __name__ == '__main__':
+    try:
+        sys.exit(main(sys.argv[1:]))
+    except KeyboardInterrupt, e:
+        print >>sys.stderr, "Exit on user request.\n"
+        sys.exit(1)

bin/ansible-test

@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-# PYTHON_ARGCOMPLETE_OK
-"""Primary entry point for ansible-test."""
-
-from __future__ import (absolute_import, division, print_function)
-
-__metaclass__ = type
-
-import os
-import sys
-
-if __name__ == '__main__':
-    sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'test', 'runner')))
-    import lib.cli
-    lib.cli.main()

bin/ansible-vault

@@ -1 +0,0 @@
-ansible

bin/ansible-vault

@@ -0,0 +1,219 @@
+#!/usr/bin/env python
+
+# (c) 2014, James Tanner <tanner.jc@gmail.com>
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ansible-pull is a script that runs ansible in local mode
+# after checking out a playbooks directory from source repo.  There is an
+# example playbook to bootstrap this script in the examples/ dir which
+# installs ansible and sets it up to run on cron.
+
+#__requires__ = ['ansible']
+#import pkg_resources
+
+import os
+import sys
+import traceback
+
+from ansible import utils
+from ansible import errors
+from ansible.utils.vault import VaultEditor
+
+from optparse import OptionParser
+
+#-------------------------------------------------------------------------------------
+# Utility functions for parsing actions/options
+#-------------------------------------------------------------------------------------
+
+VALID_ACTIONS = ("create", "decrypt", "edit", "encrypt", "rekey")
+
+def build_option_parser(action):
+    """
+    Builds an option parser object based on the action
+    the user wants to execute.
+    """
+
+    usage = "usage: %%prog [%s] [--help] [options] file_name" % "|".join(VALID_ACTIONS)
+    epilog = "\nSee '%s <command> --help' for more information on a specific command.\n\n" % os.path.basename(sys.argv[0])
+    OptionParser.format_epilog = lambda self, formatter: self.epilog
+    parser = OptionParser(usage=usage, epilog=epilog)
+
+    if not action:
+        parser.print_help()
+        sys.exit()
+
+    # options for all actions
+    #parser.add_option('-c', '--cipher', dest='cipher', default="AES256", help="cipher to use")
+    parser.add_option('--debug', dest='debug', action="store_true", help="debug")
+    parser.add_option('--vault-password-file', dest='password_file',
+                    help="vault password file")
+
+    # options specific to actions
+    if action == "create":
+        parser.set_usage("usage: %prog create [options] file_name")
+    elif action == "decrypt":
+        parser.set_usage("usage: %prog decrypt [options] file_name")
+    elif action == "edit":
+        parser.set_usage("usage: %prog edit [options] file_name")
+    elif action == "encrypt":
+        parser.set_usage("usage: %prog encrypt [options] file_name")
+    elif action == "rekey":
+        parser.set_usage("usage: %prog rekey [options] file_name")
+    
+    # done, return the parser
+    return parser
+
+def get_action(args):
+    """
+    Get the action the user wants to execute from the 
+    sys argv list.
+    """
+    for i in range(0,len(args)):
+        arg = args[i]
+        if arg in VALID_ACTIONS:
+            del args[i]
+            return arg
+    return None
+
+def get_opt(options, k, defval=""):
+    """
+    Returns an option from an Optparse values instance.
+    """
+    try:
+        data = getattr(options, k)
+    except:
+        return defval
+    if k == "roles_path":
+        if os.pathsep in data:
+            data = data.split(os.pathsep)[0]
+    return data
+
+#-------------------------------------------------------------------------------------
+# Command functions
+#-------------------------------------------------------------------------------------
+
+def _read_password(filename):
+    f = open(filename, "rb")
+    data = f.read()
+    f.close
+    data = data.strip()
+    return data
+
+def execute_create(args, options, parser):
+
+    if len(args) > 1:
+        raise errors.AnsibleError("'create' does not accept more than one filename")        
+
+    if not options.password_file:        
+        password, new_password = utils.ask_vault_passwords(ask_vault_pass=True, confirm_vault=True)
+    else:
+        password = _read_password(options.password_file)
+
+    cipher = 'AES256'
+    if hasattr(options, 'cipher'):
+        cipher = options.cipher
+
+    this_editor = VaultEditor(cipher, password, args[0])
+    this_editor.create_file()
+
+def execute_decrypt(args, options, parser):
+
+    if not options.password_file:        
+        password, new_password = utils.ask_vault_passwords(ask_vault_pass=True)
+    else:
+        password = _read_password(options.password_file)
+
+    cipher = 'AES256'
+    if hasattr(options, 'cipher'):
+        cipher = options.cipher
+
+    for f in args:
+        this_editor = VaultEditor(cipher, password, f)
+        this_editor.decrypt_file()
+
+    print "Decryption successful"
+
+def execute_edit(args, options, parser):
+
+    if len(args) > 1:
+        raise errors.AnsibleError("create does not accept more than one filename")        
+
+    if not options.password_file:        
+        password, new_password = utils.ask_vault_passwords(ask_vault_pass=True)
+    else:
+        password = _read_password(options.password_file)
+
+    cipher = None
+
+    for f in args:
+        this_editor = VaultEditor(cipher, password, f)
+        this_editor.edit_file()
+
+def execute_encrypt(args, options, parser):
+
+    if not options.password_file:        
+        password, new_password = utils.ask_vault_passwords(ask_vault_pass=True, confirm_vault=True)
+    else:
+        password = _read_password(options.password_file)
+
+    cipher = 'AES256'
+    if hasattr(options, 'cipher'):
+        cipher = options.cipher
+
+    for f in args:
+        this_editor = VaultEditor(cipher, password, f)
+        this_editor.encrypt_file()
+
+    print "Encryption successful"
+
+def execute_rekey(args, options, parser):
+
+    if not options.password_file:        
+        password, __ = utils.ask_vault_passwords(ask_vault_pass=True)
+    else:
+        password = _read_password(options.password_file)
+
+    __, new_password = utils.ask_vault_passwords(ask_vault_pass=False, ask_new_vault_pass=True, confirm_new=True)
+
+    cipher = None
+    for f in args:
+        this_editor = VaultEditor(cipher, password, f)
+        this_editor.rekey_file(new_password)
+
+    print "Rekey successful"
+
+#-------------------------------------------------------------------------------------
+# MAIN
+#-------------------------------------------------------------------------------------
+
+def main():
+
+    action = get_action(sys.argv)
+    parser = build_option_parser(action)
+    (options, args) = parser.parse_args()
+
+    # execute the desired action
+    try:
+        fn = globals()["execute_%s" % action]
+        fn(args, options, parser)
+    except Exception, err:
+        if options.debug:
+            print traceback.format_exc()
+        print "ERROR:",err
+        sys.exit(1)
+
+if __name__ == "__main__":
+    main()
+

changelogs/.changes.yaml

@@ -1,674 +0,0 @@
-releases:
-  2.6.0:
-    codename: Heartbreaker
-    fragments:
-    - v2.6.0_summary.yaml
-    release_date: '2018-06-28'
-  2.6.0a1:
-    codename: Heartbreaker
-    fragments:
-    - ansible-managed-encoding.yaml
-    - azure-lb-sku.yaml
-    - base64_filter_encoding.yaml
-    - command-support-argv.yaml
-    - copy-files-default-follow.yaml
-    - copy-no-chmod.yaml
-    - copy-recursive-copy.yml
-    - encoding-docs-plugin-parsing.yaml
-    - file-disallow-src.yaml
-    - file-nonexistent-link.yaml
-    - file-nonexitent-link-recurse.yaml
-    - file-succeed-if-already-absent.yaml
-    - gem-custom-home.yaml
-    - grafana-deprecation-warnings.yaml
-    - includes.yaml
-    - mode-preserve.yaml
-    - pause-ctrl-c.yaml
-    - postgresql_user-encrypted-fixes.yml
-    - py36-spwd.yaml
-    - template-filename-encoding.yaml
-    - user-expires.yaml
-    - v2.6.0a1_catchup.yaml
-    - v2.6.0a1_summary.yaml
-    - win_environment-do-not-delete-on-null.yaml
-    - win_file-special-char-fix.yaml
-    - win_get_url-ftp-support.yaml
-    - win_module_utils_sid-conversion.yaml
-    - win_template-dest-dir-fix.yaml
-    - win_updates_typo_whitelist_fix.yaml
-    - window_become-better-errors.yaml
-    - windows-deprecation-removal.yaml
-    - winrm-encoding-fix
-    - winrm-get_correct_user.yaml
-    - yaml-callback-unicode.yaml
-    modules:
-    - aci_l3out
-    - avi_autoscalelaunchconfig
-    - avi_l4policyset
-    - avi_useraccount
-    - aws_caller_facts
-    - aws_inspector_target
-    - aws_ses_identity_policy
-    - aws_sgw_facts
-    - azure_rm_aks
-    - azure_rm_aks_facts
-    - bigip_data_group
-    - bigip_device_license
-    - bigip_gtm_global
-    - bigip_gtm_monitor_bigip
-    - bigip_gtm_monitor_firepass
-    - bigip_gtm_monitor_http
-    - bigip_gtm_monitor_https
-    - bigip_gtm_monitor_tcp
-    - bigip_gtm_monitor_tcp_half_open
-    - bigip_gtm_pool_member
-    - bigip_gtm_virtual_server
-    - bigip_log_destination
-    - bigip_log_publisher
-    - bigip_management_route
-    - bigip_profile_dns
-    - bigip_profile_tcp
-    - bigip_profile_udp
-    - bigip_service_policy
-    - bigip_smtp
-    - bigip_snmp_community
-    - bigip_timer_policy
-    - bigip_trunk
-    - bigiq_application_fasthttp
-    - bigiq_application_fastl4_tcp
-    - bigiq_application_fastl4_udp
-    - bigiq_application_http
-    - bigiq_application_https_offload
-    - bigiq_application_https_waf
-    - bigiq_regkey_license_assignment
-    - cnos_command
-    - cnos_config
-    - cs_role_permission
-    - digital_ocean_account_facts
-    - digital_ocean_certificate_facts
-    - digital_ocean_domain_facts
-    - digital_ocean_image_facts
-    - digital_ocean_load_balancer_facts
-    - digital_ocean_region_facts
-    - digital_ocean_size_facts
-    - digital_ocean_snapshot_facts
-    - digital_ocean_tag_facts
-    - digital_ocean_volume_facts
-    - ec2_eip_facts
-    - ec2_vpc_vpn_facts
-    - exos_command
-    - fortios_webfilter
-    - gcp_compute_address
-    - gcp_compute_backend_bucket
-    - gcp_compute_backend_service
-    - gcp_compute_health_check
-    - gcp_compute_http_health_check
-    - gcp_compute_https_health_check
-    - gcp_compute_instance
-    - gcp_compute_instance_template
-    - gcp_compute_network
-    - gcp_compute_route
-    - gcp_compute_subnetwork
-    - gcp_compute_target_http_proxy
-    - gcp_compute_target_https_proxy
-    - gcp_compute_target_tcp_proxy
-    - gcp_container_cluster
-    - gcp_container_node_pool
-    - gcp_dns_resource_record_set
-    - gcp_pubsub_subscription
-    - gcp_pubsub_topic
-    - gcp_storage_bucket
-    - gcp_storage_bucket_access_control
-    - gitlab_deploy_key
-    - gitlab_hooks
-    - k8s
-    - ldap_passwd
-    - memset_zone
-    - meraki_network
-    - meraki_organization
-    - na_ontap_broadcast_domain
-    - net_get
-    - net_put
-    - netconf_get
-    - one_host
-    - one_image
-    - one_image_facts
-    - one_vm
-    - os_server_metadata
-    - os_volume_snapshot
-    - psexec
-    - purefa_ds
-    - purefa_facts
-    - purefa_pgsnap
-    - purefb_fs
-    - purefb_snap
-    - rds_instance_facts
-    - rds_snapshot_facts
-    - scaleway_compute
-    - scaleway_sshkey
-    - slxos_command
-    - slxos_config
-    - slxos_facts
-    - slxos_interface
-    - slxos_l2_interface
-    - slxos_linkagg
-    - spectrum_device
-    - sysvinit
-    - vmware_cluster_facts
-    - vmware_datastore_cluster
-    - vmware_datastore_maintenancemode
-    - vmware_guest_disk_facts
-    - vmware_guest_snapshot_facts
-    - vmware_host_capability_facts
-    - vmware_host_powerstate
-    - vmware_local_user_facts
-    - vmware_portgroup_facts
-    - vmware_resource_pool_facts
-    - vmware_tag
-    - vmware_tag_facts
-    - vmware_vswitch_facts
-    - win_domain_computer
-    - win_hostname
-    - win_pester
-    - yarn
-    - zabbix_group_facts
-    plugins:
-      callback:
-      - cgroup_memory_recap
-      - grafana_annotations
-      - sumologic
-      connection:
-      - httpapi
-      inventory:
-      - foreman
-      - generator
-      - nmap
-      lookup:
-      - onepassword
-      - onepassword_raw
-    release_date: '2018-05-21'
-  2.6.0a2:
-    codename: Heartbreaker
-    fragments:
-    - always_run_removal.yaml
-    - aws_ses_identity_check_mode.yaml
-    - powershell_use_set_tmpdir.yaml
-    - selinux-check-mode.yaml
-    - synchronize_remote_is_local.yaml
-    - v2.6.0a2_catchup.yaml
-    - v2.6.0a2_summary.yaml
-    - win_updates-add-scheduled-tasks-back.yaml
-    - winrm_kinit_error-fix.yaml
-    - xenserver-facts-fix.yaml
-    modules:
-    - acme_account
-    - aws_config_aggregation_authorization
-    - aws_config_aggregator
-    - aws_config_delivery_channel
-    - aws_config_recorder
-    - aws_config_rule
-    - aws_glue_connection
-    - aws_glue_job
-    - azure_rm_resource
-    - azure_rm_resource_facts
-    - bigip_gtm_monitor_external
-    - bigip_monitor_external
-    - bigiq_utility_license
-    - cloud_init_data_facts
-    - elb_network_lb
-    - flatpak
-    - flatpak_remote
-    - gcp_compute_disk
-    - gcp_compute_firewall
-    - gcp_compute_forwarding_rule
-    - gcp_compute_global_address
-    - gcp_compute_global_forwarding_rule
-    - gcp_compute_image
-    - gcp_compute_instance_group
-    - gcp_compute_instance_group_manager
-    - gcp_compute_ssl_certificate
-    - gcp_compute_target_pool
-    - gcp_compute_target_ssl_proxy
-    - gcp_compute_url_map
-    - gluster_peer
-    - heroku_collaborator
-    - memset_dns_reload
-    - memset_zone_domain
-    - memset_zone_record
-    - meraki_admin
-    - meraki_snmp
-    - na_ontap_aggregate
-    - na_ontap_broadcast_domain_ports
-    - na_ontap_cifs
-    - na_ontap_cifs_acl
-    - na_ontap_cifs_server
-    - na_ontap_cluster
-    - na_ontap_cluster_ha
-    - na_ontap_export_policy
-    - na_ontap_export_policy_rule
-    - na_ontap_igroup
-    - na_ontap_interface
-    - na_ontap_iscsi
-    - na_ontap_job_schedule
-    - na_ontap_license
-    - na_ontap_lun
-    - na_ontap_lun_map
-    - na_ontap_net_ifgrp
-    - na_ontap_net_port
-    - na_ontap_net_routes
-    - na_ontap_net_vlan
-    - na_ontap_nfs
-    - na_ontap_ntp
-    - na_ontap_qtree
-    - na_ontap_service_processor_network
-    - na_ontap_snapshot
-    - na_ontap_snmp
-    - na_ontap_svm
-    - na_ontap_ucadapter
-    - na_ontap_user
-    - na_ontap_user_role
-    - na_ontap_volume
-    - na_ontap_volume_clone
-    - netconf_rpc
-    - one_service
-    - slxos_l3_interface
-    - slxos_vlan
-    plugins:
-      inventory:
-      - gcp_compute
-    release_date: '2018-05-30'
-  2.6.0rc1:
-    codename: Heartbreaker
-    fragments:
-    - v2.6.0rc1_catchup.yaml
-    - v2.6.0rc1_summary.yaml
-    release_date: '2018-06-05'
-  2.6.0rc2:
-    codename: Heartbreaker
-    fragments:
-    - 41167_ansible_doc_regression.yaml
-    - admin-users-default-change.yaml
-    - aws_s3_async_fix.yaml
-    - aws_s3_decryption_fix.yaml
-    - aws_s3_fix_custom_endpoints.yaml
-    - aws_s3_fix_exception_handling.yaml
-    - ec2_ami_fix_block_device_mapping_volume_size_type.yaml
-    - v2.6.0rc2_summary.yaml
-    release_date: '2018-06-08'
-  2.6.0rc3:
-    codename: Heartbreaker
-    fragments:
-    - digital_ocean_block_storage_fix.yaml
-    - gce-sort-fix.yaml
-    - iosxr_config_route_policy_objects_fix.yaml
-    - no_log_fix_for_connection_exceptions.yaml
-    - reset_con_fix.yml
-    - v2.6.0rc3_summary.yaml
-    release_date: '2018-06-18'
-  2.6.0rc4:
-    codename: Heartbreaker
-    fragments:
-    - 41530-apt-mark-deb6.yaml
-    - debug_fixes.yml
-    - eos_vrf_failure-fix.yml
-    - file_touch_diff.yaml
-    - fix_config_required.yml
-    - fix_yaml_inv_nulls.yml
-    - missing_raise.yml
-    - v2.6.0rc4_summary.yaml
-    - vars_lk.yml
-    - virtualbox_inventory.yaml
-    - win_updates-async-fix.yml
-    - winrm_kinit-remove-pass-log.yml
-    release_date: '2018-06-25'
-  2.6.0rc5:
-    codename: Heartbreaker
-    fragments:
-    - fix_options.yml
-    - fix_password_lookup_loading.yaml
-    - group_by_localhost.yaml
-    - lineinfile-insertbefore-bof-bugfix.yaml
-    - v2.6.0rc5_summary.yaml
-    - win_iis_webapppool-output-fix.yml
-    release_date: '2018-06-26'
-  2.6.1:
-    codename: Heartbreaker
-    fragments:
-    - avoid_cwd_vars.yml
-    - basic_booleans_backward_compat.yaml
-    - file_touch_check_mode.yaml
-    - inventory_manager_fix_required_options_override.yaml
-    - junos_config_confirm_commit.yaml
-    - nsupdate_fix_hmac-sha384.yaml
-    - v2.6.1_summary.yaml
-    - win_domain-dns-typo-fix.yml
-    - win_group_membership-sid-bugfix.yml
-    - wrcwd_ansible.cfg.yml
-    release_date: '2018-07-05'
-  2.6.10:
-    codename: Heartbreaker
-    fragments:
-    - powershell-bootstrap.yaml
-    - v2.6.10_summary.yaml
-    release_date: '2018-11-30'
-  2.6.11:
-    codename: Heartbreaker
-    fragments:
-    - 45155-vmware-handle_exception.yaml
-    - 45155-vmware_host_service_facts-update_docs.yaml
-    - 47313-vmware-fix_module_error.yaml
-    - 49096-ansible-galaxy-fix_info_typo.yaml
-    - 49113-iam-role-arn-parsing-updated.yml
-    - avoid_ssh_retry_discolsures.yml
-    - nxos_facts_multiple_bugfixes.yaml
-    - nxos_install_os_nxapi_fix.yaml
-    - nxos_interface_linkagg_idempotence.yaml
-    - v2.6.11_summary.yaml
-    release_date: '2018-12-13'
-  2.6.12:
-    codename: Heartbreaker
-    fragments:
-    - 49409-lineinfile_must_not_insert_lines_multiples_times_with_insertbefore_insertafter.yml
-    - 50143-win_firewall_rule-invalid-bypass.yml
-    - 50185-win_updates-report-changes-correctly.yml
-    - acl_doc_fix.yml
-    - docker_volume-force-change-detection-revert.yaml
-    - openstack_inventory_fix.yml
-    - v2.6.12_summary.yaml
-    - win_copy-empty-dir.yaml
-    - win_lineinfile-output.yaml
-    release_date: '2019-01-17'
-  2.6.13:
-    codename: Heartbreaker
-    fragments:
-    - fix_pull_extra.yml
-    - junos_commit_error_fix.yaml
-    - ssh_connection_invalid_password.yaml
-    - systemd-warn-on-chroot.yaml
-    - v2.6.13_summary.yaml
-    - vmware_guest-documentation_fix.yaml
-    - win_power_plan-windows10.yaml
-    release_date: '2019-02-07'
-  2.6.14:
-    codename: Heartbreaker
-    fragments:
-    - 45378-fix-sql-tags.yml
-    - 51781-fixing-managed-disk-facts.yaml
-    - 52130-win_psmodule-update_nuget.yaml
-    - 52388-postgresqldatabase-fix-force-update.yml
-    - 52389-mysqldatabase-fix-force-update.yaml
-    - disallow-relative-homedir.yaml
-    - v2.6.14_summary.yaml
-    - win-become-elevation.yaml
-    - winrm-ansible-conn-error.yaml
-    release_date: '2019-02-21'
-  2.6.15:
-    codename: Heartbreaker
-    fragments:
-    - 40092-mysql_user-match-backticks.yml
-    - aws_ec2_inventory_integration_tests.yaml
-    - to_yaml-default_flow_style.yaml
-    - v2.6.15_summary.yaml
-    - win_domain-cred.yaml
-    - win_file-hidden.yaml
-    - winrm-send-input-check.yaml
-    - zypper-python3.yaml
-    release_date: '2019-03-14'
-  2.6.16:
-    codename: Heartbreaker
-    fragments:
-    - 54192-openssl_publickey-openssh-passphrase.yml
-    - v2.6.16_summary.yaml
-    - win_acl-paths.yaml
-    - win_acl_inheritance-paths.yaml
-    - win_certificate_store-paths.yaml
-    - win_chocolatey-update.yaml
-    - win_copy-paths.yaml
-    - win_file-paths.yaml
-    - win_find-paths.yaml
-    - win_mod_utils-paths.yaml
-    - win_owner-paths.yaml
-    - win_slurp-paths.yaml
-    - win_tempfile-path.yaml
-    - win_user_right-output.yaml
-    - winrm-all-timeout-exceptions.yaml
-    release_date: '2019-04-03'
-  2.6.17:
-    codename: Heartbreaker
-    fragments:
-    - 44412-copy-fix-unwanted-acls.yaml
-    - 55150-native-strings-for-signature-auth.yaml
-    - pamd-make-idempotence-fix.yaml
-    - v2.6.17_summary.yaml
-    - win_acl-network.yaml
-    - win_domain-setup.yaml
-    release_date: '2019-05-23'
-  2.6.18:
-    codename: Heartbreaker
-    fragments:
-    - fix_safe_eval.yml
-    - v2.6.18_summary.yaml
-    release_date: '2019-07-03'
-  2.6.19:
-    codename: Heartbreaker
-    fragments:
-    - dont_template_passwords_from_prompt.yml
-    - v2.6.19_summary.yaml
-    release_date: '2019-08-15'
-  2.6.2:
-    codename: Heartbreaker
-    fragments:
-    - 40839-docker_container_init.yml
-    - 42042-inventory_with_no_region.yaml
-    - 42647-win_updates.yaml
-    - clarify_error_message.yml
-    - doc_fix.yml
-    - docfix.yml
-    - docker-default-ssl.yml
-    - empty_gh_error.yaml
-    - ensure_text_source.yaml
-    - eos_l2_interface_fix.yaml
-    - fix_fact_clean.yaml
-    - fix_ios_vlan.yaml
-    - fix_pagination_cloudfront_facts.yml
-    - fix_sysvinit_typo.yml
-    - fix_tls_mail.yaml
-    - inventory_dir_ext_compare_fix.yaml
-    - ios_l2_interface-fix.yml
-    - junos_facts_fix.yaml
-    - lineinfile-empty-regexp.yml
-    - nxos_CI_failures_fix.yaml
-    - nxos_cliconf.yaml
-    - nxos_facts.yaml
-    - nxos_module_utils_nxapi_get_capabilities.yaml
-    - nxos_nxapi_default_http_behavior_fix.yaml
-    - nxos_vxlan_vtep_vni_fix.yaml
-    - openvswitch_db_make_key_optional.yaml
-    - pause-stdout-redirection.yaml
-    - pause-try-except-curses.yaml
-    - preserve_delegate_nolog.yml
-    - remote_tmp_de-escalated_user.yaml
-    - sysvinit_bugxif.yml
-    - user-freebsd-createhome-name-fix.yaml
-    - user_freebsd_always_changed_bugfix.yaml
-    - v2.6.2_summary.yaml
-    - vmware_remove_vm_sceanrio.yaml
-    - vultr-parameters-parsing.yaml
-    - vyos_command_retry.yml
-    - win_chocoalatey_install_tls12.yml
-    - win_reboot-fixes.yml
-    - win_security_policy-empty-value.yaml
-    - win_unzip_share-discard-cmdlet-output.yaml
-    - win_user-validate-fixes.yaml
-    release_date: '2018-07-27'
-  2.6.20:
-    codename: Heartbreaker
-    fragments:
-    - boto-logging-credentials.yml
-    - dont-template-cli-passwords.yml
-    - no-log-sub-options-invalid-parameter.yaml
-    - v2.6.20_summary.yaml
-    release_date: '2019-10-17'
-  2.6.3:
-    codename: Heartbreaker
-    fragments:
-    - 42786-sysvinit-fix-2-issues.yml
-    - 42943_vmware_vmnic_fix.yaml
-    - azure_nsg_deployment_lb.yaml
-    - convert-valid-data-to-bytes-for-conversion.yaml
-    - fix-selectors-error-condition.yaml
-    - fix-swap-mount-module.yaml
-    - fix-world-readable-skip-message.yaml
-    - get_url_bug_fix.yaml
-    - lxd-idempotent-config.yaml
-    - nicer_multi_error.yml
-    - nios_api_duplicate_record-fix.yaml
-    - openstack_inventory-optional-region.yaml
-    - openvswitch_db_column_value_type.yaml
-    - slack_callback_invocation.yaml
-    - v2.6.3_summary.yaml
-    - vars_prompt-allow-prompting-for-play-vars.yaml
-    - win_domain_controller-netlogon.yaml
-    release_date: '2018-08-16'
-  2.6.4:
-    codename: Heartbreaker
-    fragments:
-    - 16748-docker_container-memory.yaml
-    - 33579-docker_container-log_driver.yaml
-    - 42380-docker_container-check-mode.yaml
-    - 42641-44812-docker-env-variables.yaml
-    - 42857-docker_container-working_dir.yaml
-    - 43931-strip-trailing-comments.yml
-    - 44054--win_domain_computer.yaml
-    - 44500-win_domain_computer.yaml
-    - 44808-docker_container-idempotency.yaml
-    - aws_lightsail_documentation_fix.yml
-    - azure_rm_storageaccount.yaml
-    - fips_md5_import.yaml
-    - fix-os_router.yaml
-    - fix_ios_l2_interface.yaml
-    - fix_ios_l2_interface_vlan.yaml
-    - fix_ios_user.yaml
-    - fix_ios_vlan_interface_issue.yaml
-    - fix_no_log_loop.yml
-    - galaxy_list_all_roles.yaml
-    - more-world-readable-warning-skips.yaml
-    - network_config_diff_fix.yml
-    - nios_lookup_handle_exception.yaml
-    - nios_network_vendor_specfic_dhcp_fix.yaml
-    - no-dynamic-import-tasks.yaml
-    - nxos_banner_text.yaml
-    - nxos_file_copy_md5sum.yaml
-    - nxos_interface.yaml
-    - nxos_linkagg.yaml
-    - nxos_non_structured_output_fix.yaml
-    - nxos_static_route_fix.yaml
-    - nxos_system.yaml
-    - one_host-env-fix.yml
-    - service.yml
-    - terminal_plugin.yaml
-    - user-properly-unexpire-new-user.yaml
-    - v2.6.4_summary.yaml
-    - win_psexec_command_arg.yaml
-    - win_uri-json.yml
-    - win_wait_for-timeout.yaml
-    - zypper-on-ubuntu.yaml
-    release_date: '2018-09-06'
-  2.6.5:
-    codename: Heartbreaker
-    fragments:
-    - 45203-sysvinit-fix-unassigned-variable.yml
-    - 45628-fetch_url-error-headers.yaml
-    - 45700-docker_container-dont-parse-absent.yml
-    - ajson-nested-decode.yaml
-    - azure_rm_deployment_fix_45941.yaml
-    - dd-put-empty-files.yaml
-    - docker_container-idempotency.yaml
-    - ec2_group_fix_target_containing_list_within_list.yaml
-    - fix_44984.yaml
-    - fix_ec2_group_target_vpc_precedence.yaml
-    - fix_ec2_group_vpc_precedence_classic.yaml
-    - fix_vyos_facts.yaml
-    - get-url-fix-idempotency.yaml
-    - loop_undefined_delegate_to.yaml
-    - mysql-migrate_to_pymysql.yaml
-    - nxos_ambiguous_command_check.yaml
-    - nxos_facts_26.yaml
-    - nxos_terminal_plugin.yaml
-    - piped-transfer-empty-files.yaml
-    - plugin-filters-cfg.yaml
-    - script-module-no-file-path.yaml
-    - v2.6.5_summary.yaml
-    - win_copy-dest-quote.yaml
-    - win_group_membership-com-marshal.yaml
-    - win_keep_remote_file_python26.yaml
-    - win_say-fix.yaml
-    - winrm_pexpect.yaml
-    release_date: '2018-09-28'
-  2.6.6:
-    codename: Heartbreaker
-    fragments:
-    - 34863-rabbitmq_user_unpack_fix.yaml
-    - 44755-win_nssm_fixes.yaml
-    - 45921-os_router-ignores-enable_snat-no.yml
-    - 46049-route53-caa-ordering.txt
-    - 46245-systemd-fix-service-enable-logic.yaml
-    - 46322-docker_container-image-not-given.yaml
-    - 46594-docker_container-publish-all-ports.yml
-    - 46595-docker_container-expected_ports.yml
-    - azure-version.yaml
-    - blockinfile-bytes-fix.yaml
-    - callback_fixes.yml
-    - fix_flatten.yml
-    - free-strategy-include-var-tags.yaml
-    - lineinfile-insertbefore-index-out-of-range.yaml
-    - user-docs-underlying-tools.yaml
-    - v2.6.6_summary.yaml
-    release_date: '2018-10-19'
-  2.6.7:
-    codename: Heartbreaker
-    fragments:
-    - user-do-not-pass-ssh_key_passphrase-on-cmdline.yaml
-    - v2.6.7_summary.yaml
-    release_date: '2018-10-31'
-  2.6.8:
-    codename: Heartbreaker
-    fragments:
-    - 43997-docker_network-inspect.yaml
-    - 44988-acme-post-as-get.yaml
-    - 45508-parse-docker-service-parameter.yaml
-    - 46275-fix-_cond_not_supported_warn.yaml
-    - 46521-zabbix_host-fix-link-template-error.yml
-    - 46961_fix_aws_ec2_cache.yaml
-    - 47096-junos-terminal-regex-fix.yml
-    - 47296-docker_container-memory_swappiness.yaml
-    - 47313-vmware_utils-handle_requests_import_error.yaml
-    - 47395-docker_container-ipvX_address.yaml
-    - 47396-docker_container-detach-auto-remove.yaml
-    - 47712-docker_container-detach-auto-remove.yml
-    - 47722-vmware_guest_powerstate-restore_timeout.yaml
-    - 47889-vmware_doc-fix_privilege_names.yaml
-    - 47900-docker_container-paused.yml
-    - 47997-docker_container-ipc-pid-mode.yml
-    - 48061-docker_container-auto_removal.yml
-    - docker_volume-force-change-detection.yaml
-    - lvg_fix_47301.yaml
-    - nxos_26_changelog.yaml
-    - openssl-python3.yaml
-    - postgresql_user-not-sup-error.yaml
-    - psexec-handle-socket-errors.yaml
-    - psexec-imp-error.yaml
-    - v2.6.8_summary.yaml
-    - win_uri-junk-data.yaml
-    release_date: '2018-11-15'
-  2.6.9:
-    codename: Heartbreaker
-    fragments:
-    - 44726-correct_deprecate_call.yaml
-    - 48580-apt_key-no-tty.yaml
-    - 48808-sysvinit_defaults_if_no_runlevels.yaml
-    - ps_sb_logging.yaml
-    - user-fix-zero-negative-expiration.yaml
-    - user-password_lock-change-fix.yaml
-    - v2.6.9_summary.yaml
-    release_date: '2018-11-29'

changelogs/config.yaml

@@ -1,13 +0,0 @@
----
-release_tag_re: '(v(?:[\d.ab\-]|rc)+)'
-pre_release_tag_re: '(?P<pre_release>(?:[ab]|rc)+\d*)$'
-notesdir: fragments
-prelude_section_name: release_summary
-new_plugins_after_name: removed_features
-sections:
-- ['major_changes', 'Major Changes']
-- ['minor_changes', 'Minor Changes']
-- ['deprecated_features', 'Deprecated Features']
-- ['removed_features', 'Removed Features (previously deprecated)']
-- ['bugfixes', 'Bugfixes']
-- ['known_issues', 'Known Issues']

changelogs/fragments/16748-docker_container-memory.yaml

@@ -1,5 +0,0 @@
-bugfixes:
-- "docker_container: makes unit parsing for memory sizes more consistent, and
-   fixes idempotency problem when ``kernel_memory`` is set (see
-   https://github.com/ansible/ansible/pull/16748 and
-   https://github.com/ansible/ansible/issues/42692)"

changelogs/fragments/33579-docker_container-log_driver.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "Allow arbitrary ``log_driver`` for docker_container (https://github.com/ansible/ansible/pull/33579)."

changelogs/fragments/34863-rabbitmq_user_unpack_fix.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- Ignore empty result of rabbitmqctl list_user_permissions.

changelogs/fragments/40092-mysql_user-match-backticks.yml

@@ -1,2 +0,0 @@
-bugfixes:
-  - "mysql_user: match backticks, single and double quotes when checking user privileges."

changelogs/fragments/40839-docker_container_init.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- fixes docker_container compatibilty with docker-py < 2.2

changelogs/fragments/41167_ansible_doc_regression.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- ansible-doc - fixed traceback on missing plugins (https://github.com/ansible/ansible/pull/41167)

changelogs/fragments/41530-apt-mark-deb6.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - fix apt-mark on debian6 (https://github.com/ansible/ansible/pull/41530)

changelogs/fragments/42042-inventory_with_no_region.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- plugins/inventory/openstack.py - Do not create group with empty name if region is not set

changelogs/fragments/42380-docker_container-check-mode.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "fixes docker_container check and debug mode (https://github.com/ansible/ansible/pull/42380)"

changelogs/fragments/42641-44812-docker-env-variables.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "The docker_* modules respect the DOCKER_* environment variables again (https://github.com/ansible/ansible/pull/42641)."

changelogs/fragments/42647-win_updates.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- win_updates - fixed module return value is lost in error in some cases (https://github.com/ansible/ansible/pull/42647)

changelogs/fragments/42786-sysvinit-fix-2-issues.yml

@@ -1,4 +0,0 @@
-bugfixes:
-- "sysvinit module: handle values of optional parameters (https://github.com/ansible/ansible/pull/42786).
-  Don't disable service when `enabled` parameter isn't set.
-  Fix command when `arguments` parameter isn't set."

changelogs/fragments/42857-docker_container-working_dir.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container: fixing ``working_dir`` idempotency problem (https://github.com/ansible/ansible/pull/42857)"

changelogs/fragments/42943_vmware_vmnic_fix.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- VMware handle pnic in proxyswitch (https://github.com/ansible/ansible/pull/42996)

changelogs/fragments/43931-strip-trailing-comments.yml

@@ -1,2 +0,0 @@
-bugfixes:
-  - user - Strip trailing comments in /etc/default/passwd (https://github.com/ansible/ansible/pull/43931)

changelogs/fragments/43997-docker_network-inspect.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_network - fixes idempotency issues (https://github.com/ansible/ansible/issues/33045) and name substring issue (https://github.com/ansible/ansible/issues/32926)."

changelogs/fragments/44054--win_domain_computer.yaml

@@ -1,3 +0,0 @@
-bugfixes:
-- win_domain_computer - fixed error when description parameter is empty (https://github.com/ansible/ansible/pull/44054)
-- win_domain_computer - fixed error in diff_support

changelogs/fragments/44412-copy-fix-unwanted-acls.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - Fix unwanted ACLs when using copy module (https://github.com/ansible/ansible/issues/44412)

changelogs/fragments/44500-win_domain_computer.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- win_domain_computer - fixed deletion of computer active directory object that have dependent objects (https://github.com/ansible/ansible/pull/44500)

changelogs/fragments/44726-correct_deprecate_call.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - Fix calling deprecate with correct arguments (https://github.com/ansible/ansible/pull/46062).

changelogs/fragments/44755-win_nssm_fixes.yaml

@@ -1,10 +0,0 @@
-bugfixes:
-- win_nssm - Fix several issues and idempotency problems (https://github.com/ansible/ansible/pull/44755)
-- win_nssm - Fix service not started when ``state=started`` (https://github.com/ansible/ansible/issues/35442)
-- win_nssm - Correctly escape argument line when a parameter contains spaces, quotes or backslashes
-- win_nssm - Add missing space between parameters with ``app_parameters``
-- win_nssm - Fix extra space added in argument line with ``app_parameters`` or ``app_parameters_free_form`` when a parameter start by a dash and is followed by a period (https://github.com/ansible/ansible/issues/44079)
-- win_nssm - Fix error when several services were given to the ``dependencies`` option
-
-minor_changes:
-- win_nssm - Drop support of literal YAML dictionnary for ``app_parameters`` option. Use the ``key=value;`` string form instead

changelogs/fragments/44808-docker_container-idempotency.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "improves docker_container idempotency (https://github.com/ansible/ansible/pull/44808)"

changelogs/fragments/44988-acme-post-as-get.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "ACME modules support `POST-as-GET <https://community.letsencrypt.org/t/acme-v2-scheduled-deprecation-of-unauthenticated-resource-gets/74380>`__ and will be able to access Let's Encrypt ACME v2 endpoint after November 1st, 2019."

changelogs/fragments/45155-vmware-handle_exception.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- vmware_host_service_facts - handle exception when service package does not have package name.

changelogs/fragments/45155-vmware_host_service_facts-update_docs.yaml

@@ -1,2 +0,0 @@
-minor_changes:
-- Update docs and return section of vmware_host_service_facts module.

changelogs/fragments/45203-sysvinit-fix-unassigned-variable.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- Fix referenced before assignment in sysvinit module

changelogs/fragments/45378-fix-sql-tags.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- azure_rm_sqlserver - fix for tags support

changelogs/fragments/45508-parse-docker-service-parameter.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - docker_service - correctly parse string values for the `scale` parameter https://github.com/ansible/ansible/pull/45508

changelogs/fragments/45628-fetch_url-error-headers.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "fetch_url did not always return lower-case header names in case of HTTP errors (https://github.com/ansible/ansible/pull/45628)."

changelogs/fragments/45700-docker_container-dont-parse-absent.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- "Don't parse parameters and options when ``state`` is ``absent`` (https://github.com/ansible/ansible/pull/45700)."

changelogs/fragments/45921-os_router-ignores-enable_snat-no.yml

@@ -1,2 +0,0 @@
-bugfixes:
-    - "os_router - ``enable_snat: no`` was ignored."

changelogs/fragments/46049-route53-caa-ordering.txt

@@ -1,2 +0,0 @@
-bugfixes:
-- "route53 - fix CAA record ordering for idempotency."

changelogs/fragments/46245-systemd-fix-service-enable-logic.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- In systemd module, fix check if a systemd+initd service is enabled - disabled in systemd means disabled

changelogs/fragments/46275-fix-_cond_not_supported_warn.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-    - Fix for StrategyModule object has no attribute _cond_not_supported_warn (https://github.com/ansible/ansible/issues/46275)

changelogs/fragments/46322-docker_container-image-not-given.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container - the behavior is improved in case ``image`` is not specified, but needed for (re-)creating the container."

changelogs/fragments/46521-zabbix_host-fix-link-template-error.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- "zabbix_host - module was failing when zabbix host was updated with new interface and template depending on that interface at the same time"

changelogs/fragments/46594-docker_container-publish-all-ports.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container - ``publish_ports: all`` was not used correctly when checking idempotency."

changelogs/fragments/46595-docker_container-expected_ports.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container - fix idempotency check for published_ports in some special cases."

changelogs/fragments/46961_fix_aws_ec2_cache.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - aws_ec2 - fixed issue where cache did not contain the computed groups

changelogs/fragments/47096-junos-terminal-regex-fix.yml

@@ -1,2 +0,0 @@
-bugfixes:
-  - junos - fix terminal prompt regex (https://github.com/ansible/ansible/pull/47096)

changelogs/fragments/47296-docker_container-memory_swappiness.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container - fix ``memory_swappiness`` documentation."

changelogs/fragments/47313-vmware-fix_module_error.yaml

@@ -1,4 +0,0 @@
----
-bugfixes:
-  - Fix VMware module utils for self usage.
-  - Added unit test for VMware module_utils.

changelogs/fragments/47313-vmware_utils-handle_requests_import_error.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- Avoid misleading PyVmomi error if requests import fails in vmware module utils.

changelogs/fragments/47395-docker_container-ipvX_address.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container - fail if ``ipv4_address`` or ``ipv6_address`` is used with a too old docker-py version."

changelogs/fragments/47396-docker_container-detach-auto-remove.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container - fix behavior of ``detach: yes`` if ``auto_remove: yes`` is specified."

changelogs/fragments/47712-docker_container-detach-auto-remove.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container - fixing race condition when ``detach`` and ``auto_remove`` are both ``true``."

changelogs/fragments/47722-vmware_guest_powerstate-restore_timeout.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- Restore timeout in set_vm_power_state operation in vmware_guest_powerstate module.

changelogs/fragments/47889-vmware_doc-fix_privilege_names.yaml

@@ -1,2 +0,0 @@
-minor_changes:
-- Update plugin filter documentation.

changelogs/fragments/47900-docker_container-paused.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container - fix ``paused`` option (which never worked)."

changelogs/fragments/47997-docker_container-ipc-pid-mode.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container - fix ``ipc_mode`` and ``pid_mode`` idempotency if the ``host:<container-name>`` form is used (as opposed to ``host:<container-id>``)."

changelogs/fragments/48061-docker_container-auto_removal.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- "docker_container - do not fail when removing a container which has ``auto_remove: yes``."

changelogs/fragments/48580-apt_key-no-tty.yaml

@@ -1,3 +0,0 @@
-bugfixes:
-  - apt_key - Disable TTY requirement in GnuPG for the module to work correctly
-    when SSH pipelining is enabled (https://github.com/ansible/ansible/pull/48580)

changelogs/fragments/48808-sysvinit_defaults_if_no_runlevels.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - sysvinit - enabling a service should use "defaults" if no runlevels are specified

changelogs/fragments/49096-ansible-galaxy-fix_info_typo.yaml

@@ -1,2 +0,0 @@
-minor_changes:
-- Fixed typo in ansible-galaxy info command.

changelogs/fragments/49113-iam-role-arn-parsing-updated.yml

@@ -1,2 +0,0 @@
-bugfixes:
-  - ec2_metadata_facts - Parse IAM role name from the security credential field since the instance profile name is different

changelogs/fragments/49409-lineinfile_must_not_insert_lines_multiples_times_with_insertbefore_insertafter.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - "This reverts some changes from commit 723daf3. If a line is found in the file, exactly or via regexp matching, it must not be added again. `insertafter`/`insertbefore` options are used only when a line is to be inserted, to specify where it must be added."

changelogs/fragments/50143-win_firewall_rule-invalid-bypass.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- win_firewall_rule - Remove invalid 'bypass' action

changelogs/fragments/50185-win_updates-report-changes-correctly.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- win_updates - Correctly report changes on success

changelogs/fragments/51781-fixing-managed-disk-facts.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - azure_rm_managed_disk_facts - added missing implementation of listing managed disks by resource group