Version bump for 1.9.0-2

break up the tests so that we can maybe  run this on at least one
platform

.coveragerc

@@ -1,25 +1,4 @@
-# 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.
+[report]
 omit =
-    */python*/dist-packages/*
-    */python*/site-packages/*
-    */python*/distutils/*
-    */pyshared/*
-    */pytest
+    */python?.?/*
+    */site-packages/nose/*

.gitattributes

@@ -1,2 +1 @@
-.github/ export-ignore
-hacking/ export-ignore
+CHANGELOG.md merge=union

.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,39 @@ 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/
+debian/
 deb-build
 # Vim swap files
 *.swp
 *.swo
 credentials.yml
 # test output
-*.retry
-*.out
-.pytest_cache/
+.coverage
 .tox
-.cache
-.pytest_cache
 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

.gitmodules

@@ -0,0 +1,16 @@
+[submodule "lib/ansible/modules/core"]
+	path = lib/ansible/modules/core
+	url = https://github.com/ansible/ansible-modules-core.git
+	branch = devel
+[submodule "lib/ansible/modules/extras"]
+	path = lib/ansible/modules/extras
+	url = https://github.com/ansible/ansible-modules-extras.git
+	branch = devel
+[submodule "v2/ansible/modules/core"]
+	path = v2/ansible/modules/core
+	url = https://github.com/ansible/ansible-modules-core.git
+	branch = devel
+[submodule "v2/ansible/modules/extras"]
+	path = v2/ansible/modules/extras
+	url = https://github.com/ansible/ansible-modules-extras.git
+	branch = devel

.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>

.travis.yml

@@ -0,0 +1,11 @@
+sudo: false
+language: python
+env:
+  - TOXENV=py26
+  - TOXENV=py27
+install:
+  - pip install tox
+script:
+  - tox
+after_success:
+  - coveralls

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.
 
@@ -14,16 +14,16 @@ 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!!  
 
-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/dev_guide/testing_pep8.html#running-locally).
-  * 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
 =======
@@ -32,7 +32,7 @@ Testing
   * 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
 ==========
@@ -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,22 +101,22 @@ 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
@@ -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:
 
@@ -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,11 +289,11 @@ 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 do "git pull --rebase" and "git rebase" vs "git pull" or "git merge".
 
-Always create a new branch for each pull request to avoid intermingling different features or fixes on the same branch.
+Always create a new branch for each pull request to avoid intertwingling different features or fixes on the same branch.
 
    
 Python Version Compliance
@@ -302,7 +301,7 @@ 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,27 @@
-# WELCOME TO ANSIBLE GITHUB
+Welcome To Ansible GitHub
+=========================
 
 Hi! Nice to see you here!
 
-## QUESTIONS ?
+If you'd like to ask a question
+===============================
 
-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.
+Please see [this web page ](http://docs.ansible.com/community.html) for community information, which includes pointers on how to ask questions on the [mailing lists](http://docs.ansible.com/community.html#mailing-list-information) and IRC.  
 
-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.
+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, and that page has the pointers to those.
 
-## CONTRIBUTING ?
+If you'd like to contribute code
+================================
 
-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.
+Please see [this web page](http://docs.ansible.com/community.html) for information about the contribution process.  Important license agreement information is also included on that page.
 
-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.
+If you'd like to file a bug
+===========================
 
-## BUG TO REPORT ?
+I'd also read the community page above, but in particular, make sure you copy [this issue template](https://github.com/ansible/ansible/blob/devel/ISSUE_TEMPLATE.md) into your ticket description.  We have a friendly neighborhood bot that will remind you if you forget :)  This template helps us organize tickets faster and prevents asking some repeated questions, so it's very helpful to us and we appreciate your help with it.
 
-First and foremost, also check the [community guide](https://docs.ansible.com/ansible/latest/community/index.html).
-
-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.
-
-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
+Also please make sure you are testing on the latest released version of Ansible or the development branch.
 
 Thanks!
+
+

ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+##### Issue Type:
+
+Can you help us out in labelling this by telling us what kind of ticket this this?  You can say “Bug Report”, “Feature Idea”, “Feature Pull Request”, “New Module Pull Request”, “Bugfix Pull Request”, “Documentation Report”, or “Docs Pull Request”.
+
+##### Ansible Version:
+
+Let us know what version of Ansible you are using.  Please supply the verbatim output from running “ansible --version”.  If you're filing a ticket on a version of Ansible which is not the latest, we'd greatly appreciate it if you could retest on the latest version first.  We don't expect you to test against the development branch most of the time, but we may ask for that if you have cycles.  Thanks!
+
+##### Environment:
+
+What OS are you running Ansible from and what OS are you managing?  Examples include RHEL 5/6, Centos 5/6, Ubuntu 12.04/13.10, *BSD, Solaris.  If this is a generic feature request or it doesn’t apply, just say “N/A”.  Not all tickets may be about operating system related things and we understand that.
+
+##### Summary:
+
+Please summarize your request in this space.  You will earn bonus points for being succinct, but please add enough detail so we can understand the request.  Thanks!
+
+##### Steps To Reproduce:
+
+If this is a bug ticket, please enter the steps you use to reproduce the problem in the space below.  If this is a feature request, please enter the steps you would use to use the feature.  If an example playbook is useful, please include a short reproducer inline, indented by four spaces.  If a longer one is necessary, linking to one uploaded to gist.github.com would be great.  Much appreciated!
+
+##### Expected Results:
+
+Please enter your expected results in this space.  When running the steps supplied above in the previous section, what did you expect to happen?  If showing example output, please indent your output by four spaces so it will render correctly in GitHub's viewer thingy.
+
+##### Actual Results:
+
+Please enter your actual results in this space.  When running the steps supplied above, what actually happened?  If you are showing example output, please indent your output by four spaces so it will render correctly in GitHub.  Thanks again!
+

MANIFEST.in

@@ -1,20 +1,18 @@
+prune v2
+prune docsite
+prune ticket_stubs
+prune packaging
+prune test
 prune hacking
-include README.rst
-include COPYING
-include SYMLINK_CACHE.json
-include requirements.txt
-include .coveragerc
+include README.md packaging/rpm/ansible.spec COPYING
 include examples/hosts
 include examples/ansible.cfg
-recursive-include lib/ansible/module_utils/powershell *
+include lib/ansible/module_utils/powershell.ps1
 recursive-include lib/ansible/modules *
-recursive-include lib/ansible/galaxy/data *
 recursive-include docs *
-recursive-include licenses *
-recursive-include packaging *
-recursive-include test *
+recursive-include plugins *
 include Makefile
+include VERSION
 include MANIFEST.in
-include changelogs/CHANGELOG-*.rst
-include contrib/README.md
-recursive-include contrib/inventory *
+prune lib/ansible/modules/core/.git
+prune lib/ansible/modules/extras/.git

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,3 +1,4 @@
+#!/usr/bin/make
 # WARN: gmake syntax
 ########################################################
 # Makefile for Ansible
@@ -9,7 +10,7 @@
 #   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/dev_guide/testing_units.html for requirements)
+#   make tests ---------------- run the tests (see test/README.md for requirements)
 #   make pyflakes, make pep8 -- source code checks
 
 ########################################################
@@ -17,51 +18,34 @@
 
 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 | cut -f1 -d' ')
+RELEASE := $(shell cat VERSION | cut -f2 -d' ')
 
 # Get the branch information from git
 ifneq ($(shell which git),)
 GIT_DATE := $(shell git log -n 1 --format="%ai")
-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 = ""
 endif
 
-ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1)
+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)
-CPUS ?= $(shell sysctl hw.ncpu|awk '{print $$2}')
 else
 DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M)
-CPUS ?= $(shell nproc)
 endif
 
 # DEB build parameters
@@ -69,17 +53,15 @@ 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
+    DEB_RELEASE = $(RELEASE)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)
+    DEB_RELEASE = 0.git$(DATE)
     # Do not sign unofficial builds
     DEBUILD_OPTS += -uc -us
     DPUT_OPTS += -u
@@ -89,123 +71,78 @@ 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}')
-
+RPMRELEASE = $(RELEASE)
 ifneq ($(OFFICIAL),yes)
-    RPMRELEASE = 100.git$(DATE)$(GITINFO)
+    RPMRELEASE = 0.git$(DATE)
 endif
-ifeq ($(PUBLISH),nightly)
-    # https://fedoraproject.org/wiki/Packaging:Versioning#Snapshots
-    RPMRELEASE = $(RELEASE).$(DATE)git.$(GIT_HASH)
-endif
-
-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)"
+RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)"
 
 # MOCK build parameters
 MOCK_BIN ?= mock
 MOCK_CFG ?=
 
-# dynamically add repotag define only if specified
-ifneq ($(REPOTAG),)
-    EXTRA_RPM_DEFINES += --define "repotag $(REPOTAG)"
-endif
+NOSETESTS ?= nosetests
 
-# ansible-test parameters
-ANSIBLE_TEST ?= test/runner/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 ?=
+NOSETESTS3 ?= nosetests-3.3
 
 ########################################################
 
-.PHONY: all
 all: clean python
 
-.PHONY: tests
 tests:
-	$(ANSIBLE_TEST) units -v --python $(PYTHON_VERSION) $(TEST_FLAGS)
+	PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches
 
-.PHONY: tests-py3
-tests-py3:
-	$(ANSIBLE_TEST) units -v --python $(PYTHON3_VERSION) $(TEST_FLAGS)
+newtests:
+	PYTHONPATH=./v2:./lib $(NOSETESTS) -d -w v2/test -v --with-coverage --cover-package=ansible --cover-branches
 
-.PHONY: tests-nonet
-tests-nonet:
-	$(ANSIBLE_TEST) units -v --python $(PYTHON_VERSION) $(TEST_FLAGS)  --exclude test/units/modules/network/
+newtests-py3:
+	PYTHONPATH=./v2:./lib $(NOSETESTS3) -d -w v2/test -v --with-coverage --cover-package=ansible --cover-branches
 
-.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 +152,36 @@ 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
+	find . -type f -name '*.pyc' -delete
 
-.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)
+	$(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build/  --buildsrpm --spec rpm-build/$(NAME).spec --sources rpm-build/
 	@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)
+	$(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build/ --rebuild rpm-build/$(NAME)-*.src.rpm
 	@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 +189,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 +196,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 +203,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,45 +212,25 @@ 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 ; \
+	    sed -ie "s#^$(NAME) (\([^)]*\)) \([^;]*\);#ansible (\1-$(DEB_RELEASE)~$${DIST}) $${DIST};#" 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
+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 ; \
+	    echo deb-build/$${DIST}/$(NAME)_$(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) ; \
@@ -359,43 +238,23 @@ deb-src: debian
 	@echo "#############################################"
 	@echo "Ansible DEB artifacts:"
 	@for DIST in $(DEB_DIST) ; do \
-	    echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \
+	    echo deb-build/$${DIST}/$(NAME)_$(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 ; \
+	    $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(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 ; \
+	    $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \
 	done
 
-.PHONY: epub
-epub:
-	(cd docs/docsite/; CPUS=$(CPUS) $(MAKE) epub)
-
 # 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,57 @@
+[![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)
+[![Build Status](https://travis-ci.org/ansible/ansible.svg?branch=tox_and_travis)](https://travis-ci.org/ansible/ansible)
+
+
+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 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 decide to go with the development branch, be sure to run "git submodule update --init --recursive" after doing a checkout. 
+
+If you want to download a tarball of a release, go to [releases.ansible.com](http://releases.ansible.com/ansible), though most users use yum (using the EPEL instructions linked above), apt (using the PPA instructions linked above), or "pip install ansible".
+
+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](http://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 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.
+   * Users list: [ansible-project](http://groups.google.com/group/ansible-project)
+   * Development list: [ansible-devel](http://groups.google.com/group/ansible-devel)
+   * Announcement list: [ansible-announce](http://groups.google.com/group/ansible-announce) - read only
+   * irc.freenode.net: #ansible
+
+Branch Info
+===========
+
+   * Releases are named after Van Halen songs.
+   * The devel branch corresponds to the release actively under development.
+   * As of 1.8, modules are kept in different repos, you'll want to follow [core](https://github.com/ansible/ansible-modules-core) and [extras](https://github.com/ansible/ansible-modules-extras)
+   * Various release-X.Y branches exist for previous releases.
+   * We'd love to have your contributions, read [Community Information](http://docs.ansible.com/community.html) for notes on how to get started.
+
+Authors
+=======
+
+Ansible was created by [Michael DeHaan](https://github.com/mpdehaan) (michael.dehaan/gmail/com) and has contributions from over 900 users (and growing).  Thanks everyone!
+
+Ansible is sponsored by [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,65 @@
+Ansible Releases at a Glance
+============================
+
+Active Development
+++++++++++++++++++
+
+2.0    "TBD" - in progress
+
+Released
+++++++++
+
+1.9.0  "Dancing In the Streets" 03-25-2015
+1.8.4  "You Really Got Me" ---- 02-19-2015
+1.8.3  "You Really Got Me" ---- 02-17-2015
+1.8.2  "You Really Got Me" ---- 12-04-2014
+1.8.1  "You Really Got Me" ---- 11-26-2014
+1.8    "You Really Got Me" ---- 11-25-2014
+1.7.2  "Summer Nights" -------- 09-24-2014
+1.7.1  "Summer Nights" -------- 08-14-2014
+1.7    "Summer Nights" -------- 08-06-2014
+1.6.10 "The Cradle Will Rock" - 07-25-2014
+1.6.9  "The Cradle Will Rock" - 07-24-2014
+1.6.8  "The Cradle Will Rock" - 07-22-2014
+1.6.7  "The Cradle Will Rock" - 07-21-2014
+1.6.6  "The Cradle Will Rock" - 07-01-2014
+1.6.5  "The Cradle Will Rock" - 06-25-2014
+1.6.4  "The Cradle Will Rock" - 06-25-2014
+1.6.3  "The Cradle Will Rock" - 06-09-2014
+1.6.2  "The Cradle Will Rock" - 05-23-2014
+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.9.0 2

bin/ansible

@@ -18,8 +18,6 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 __requires__ = ['ansible']
 try:
@@ -33,131 +31,177 @@ except Exception:
     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()
+        if C.DEFAULT_LOAD_CALLBACK_PLUGINS:
+            callbacks.load_callback_plugins()
+
+    # ----------------------------------------------
+
+    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)
+
+        # privlege escalation command line arguments need to be mutually exclusive
+        utils.check_mutually_exclusive_privilege(options, parser)
+
+        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]
+
+        sshpass = becomepass = vault_pass = become_method = None
+
+        # Never ask for an SSH password when we run with local connection
+        if options.connection == "local":
+            options.ask_pass = False
+        else:
+            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
+
+        # become
+        utils.normalize_become_options(options)
+        prompt_method = utils.choose_pass_prompt(options)
+        (sshpass, becomepass, vault_pass) = utils.ask_passwords(ask_pass=options.ask_pass, become_ask_pass=options.become_ask_pass, ask_vault_pass=options.ask_vault_pass, become_method=prompt_method)
+
+        # read vault_pass from a file
+        if not options.ask_vault_pass and options.vault_password_file:
+            vault_pass = utils.read_vault_file(options.vault_password_file)
+
+        extra_vars = utils.parse_extra_vars(options.extra_vars, vault_pass)
+
+        inventory_manager = inventory.Inventory(options.inventory, vault_password=vault_pass)
+        if options.subset:
+            inventory_manager.subset(options.subset)
+        hosts = inventory_manager.list_hosts(pattern)
+
+        if len(hosts) == 0:
+            callbacks.display("No hosts matched", stderr=True)
+            sys.exit(0)
+
+        if options.listhosts:
+            for host in hosts:
+                callbacks.display('    %s' % host)
+            sys.exit(0)
+
+        if options.module_name in ['command','shell'] and not options.module_args:
+            callbacks.display("No argument passed to %s module" % options.module_name, color='red', stderr=True)
+            sys.exit(1)
+
+        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,
+            transport=options.connection,
+            subset=options.subset,
+            check=options.check,
+            diff=options.check,
+            vault_pass=vault_pass,
+            become=options.become,
+            become_method=options.become_method,
+            become_pass=becomepass,
+            become_user=options.become_user,
+            extra_vars=extra_vars,
+        )
+
+        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
 
 
-# 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()))
-
-
-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,309 +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 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
-
-
-@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
-        cur_line = stdin.readline()
-        init_data = b''
-
-        while cur_line.strip() != b'#END_INIT#':
-            if cur_line == b'':
-                raise Exception("EOF found before init data was complete")
-            init_data += cur_line
-            cur_line = stdin.readline()
-
-        cur_line = stdin.readline()
-        vars_data = b''
-
-        while cur_line.strip() != b'#END_VARS#':
-            if cur_line == b'':
-                raise Exception("EOF found before vars data was complete")
-            vars_data += cur_line
-            cur_line = stdin.readline()
-
-        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()
-
-                    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,337 @@
+#!/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
+import fcntl
+import termios
+import struct
+
+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 = ('.pyc', '.swp', '.bak', '~', '.rpm')
+IGNORE_FILES = [ "COPYING", "CONTRIBUTING", "LICENSE", "README", "VERSION"]
+
+_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 subprocess.call('(less --version) 2> /dev/null', shell = True) == 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 + ")"
+        if 'default' in opt:
+            default = str(opt['default'])
+            desc = desc + " [Default: " + default + "]"
+        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("EXAMPLES:")
+        text.append(doc['plainexamples'])
+    if 'returndocs' in doc and doc['returndocs'] is not None:
+        text.append("RETURN VALUES:")
+        text.append(doc['returndocs'])
+    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):
+    tty_size = 0
+    if os.isatty(0):
+        tty_size = struct.unpack('HHHH',
+            fcntl.ioctl(0, termios.TIOCGWINSZ, struct.pack('HHHH', 0, 0, 0, 0)))[1]
+    columns = max(60, tty_size)
+    displace = max(len(x) for x in module_list)
+    linelimit = columns - displace - 5
+    text = []
+    deprecated = []
+    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 filename.endswith(".ps1"):
+            continue
+        if os.path.isdir(filename):
+            continue
+
+        try:
+            doc, plainexamples, returndocs = module_docs.get_docstring(filename)
+            desc = tty_ify(doc.get('short_description', '?')).strip()
+            if len(desc) > linelimit:
+                desc = desc[:linelimit] + '...'
+
+            if module.startswith('_'): # Handle deprecated
+                deprecated.append("%-*s %-*.*s" % (displace, module[1:], linelimit, len(desc), desc))
+            else:
+                text.append("%-*s %-*.*s" % (displace, module, linelimit, len(desc), desc))
+        except:
+            traceback.print_exc()
+            sys.stderr.write("ERROR: module %s has a documentation error formatting or is missing documentation\n" % module)
+
+    if len(deprecated) > 0:
+        text.append("\nDEPRECATED:")
+        text.extend(deprecated)
+    return "\n".join(text)
+
+def find_modules(path, module_list):
+
+    if os.path.isdir(path):
+        for module in os.listdir(path):
+            if module.startswith('.'):
+                continue
+            elif os.path.isdir(module):
+                find_modules(module, module_list)
+            elif any(module.endswith(x) for x in BLACKLIST_EXTS):
+                continue
+            elif module.startswith('__'):
+                continue
+            elif module in IGNORE_FILES:
+                continue
+            elif module.startswith('_'):
+                fullpath = '/'.join([path,module])
+                if os.path.islink(fullpath): # avoids aliases
+                    continue
+
+            module = os.path.splitext(module)[0] # removes the extension
+            module_list.append(module)
+
+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 modules
+        paths = utils.plugins.module_finder._get_paths()
+        module_list = []
+        for path in paths:
+            find_modules(path, module_list)
+
+        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, returndocs = 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
+            doc['returndocs']       = returndocs
+
+            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,957 @@
+#!/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 subprocess
+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
+import ansible.utils
+from ansible.errors import AnsibleError
+
+default_meta_template = """---
+galaxy_info:
+  author: {{ author }}
+  description: {{description}}
+  company: {{ company }}
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: {{ issue_tracker_url }}
+  # 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.
+  # 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")
+SKIP_INFO_KEYS = ("platforms","readme_html", "related", "summary_fields", "average_aw_composite", "average_aw_score", "url" )
+
+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.')
+        parser.add_option(
+            '--offline', dest='offline', default=False, action='store_true',
+            help="Don't query the galaxy API when creating roles")
+    elif action == "install":
+        parser.set_usage("usage: %prog install [options] [-r FILE | role_name(s)[,version] | scm+role_repo_url[,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, notify=True):
+    """
+    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]
+        if notify:
+            print "- downloading role '%s', owned by %s" % (role_name, user_name)
+    except:
+        parser.print_help()
+        print "- invalid role name (%s). Specify role as format: 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
+
+#-------------------------------------------------------------------------------------
+# scm repo utility functions
+#-------------------------------------------------------------------------------------
+
+def scm_archive_role(scm, role_url, role_version, role_name):
+    if scm not in ['hg', 'git']:
+        print "- scm %s is not currently supported" % scm
+        return False
+    tempdir = tempfile.mkdtemp()
+    clone_cmd = [scm, 'clone', role_url, role_name]
+    with open('/dev/null', 'w') as devnull:
+        try:
+            print "- executing: %s" % " ".join(clone_cmd)
+            popen = subprocess.Popen(clone_cmd, cwd=tempdir, stdout=devnull, stderr=devnull)
+        except:
+            raise AnsibleError("error executing: %s" % " ".join(clone_cmd))
+        rc = popen.wait()
+    if rc != 0:
+        print "- command %s failed" % ' '.join(clone_cmd)
+        print "  in directory %s" % tempdir
+        return False
+
+    temp_file = tempfile.NamedTemporaryFile(delete=False, suffix='.tar')
+    if scm == 'hg':
+        archive_cmd = ['hg', 'archive', '--prefix', "%s/" % role_name]
+        if role_version:
+            archive_cmd.extend(['-r', role_version])
+        archive_cmd.append(temp_file.name)
+    if scm == 'git':
+        archive_cmd = ['git', 'archive', '--prefix=%s/' % role_name, '--output=%s' % temp_file.name]
+        if role_version:
+            archive_cmd.append(role_version)
+        else:
+            archive_cmd.append('HEAD')
+
+    with open('/dev/null', 'w') as devnull:
+        print "- executing: %s" % " ".join(archive_cmd)
+        popen = subprocess.Popen(archive_cmd, cwd=os.path.join(tempdir, role_name),
+                                 stderr=devnull, stdout=devnull)
+        rc = popen.wait()
+    if rc != 0:
+        print "- command %s failed" % ' '.join(archive_cmd)
+        print "  in directory %s" % tempdir
+        return False
+
+    shutil.rmtree(tempdir, ignore_errors=True)
+
+    return temp_file.name
+
+
+#-------------------------------------------------------------------------------------
+# 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
+    if '://' in role_name:
+        archive_url = role_name
+    else: 
+        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:
+        if role_filename.endswith('.gz'):
+            role_tar_file = tarfile.open(role_filename, "r:gz")
+        else:
+            role_tar_file = tarfile.open(role_filename, "r")
+        # verify the role's meta file
+        meta_file = None
+        members = role_tar_file.getmembers()
+        # next find the metadata file
+        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'), 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, and remove any relative path
+                # bits that might be in the file for security purposes
+                # and drop the leading directory, as mentioned above
+                if member.isreg():
+                    parts = member.name.split("/")[1:]
+                    final_parts = []
+                    for part in parts:
+                        if part != '..' and '~' not in part and '$' not in part:
+                            final_parts.append(part)
+                    member.name = os.path.join(*final_parts)
+                    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)
+    offline    = get_opt(options, 'offline', False)
+
+    if not offline:
+        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 "  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 = []
+            if not offline:
+                platforms = api_get_list(api_server, "platforms") or []
+            categories = []
+            if not offline:
+                categories = api_get_list(api_server, "categories") or []
+
+            # 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)',
+                issue_tracker_url = 'http://example.com/issue/tracker',
+                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.
+    """
+
+    if len(args) == 0:
+        # the user needs to specify a role
+        parser.print_help()
+        print "- you must specify a user/role name"
+        sys.exit(1)
+
+    api_server = get_opt(options, "api_server", "galaxy.ansible.com")
+    api_config = api_get_config(api_server)
+    roles_path = get_opt(options, "roles_path")
+
+    for role in args:
+
+        role_info = {}
+
+        install_info = get_galaxy_install_info(role, options)
+        if install_info:
+            if 'version' in install_info:
+                install_info['intalled_version'] = install_info['version']
+                del install_info['version']
+            role_info.update(install_info)
+
+        remote_data = api_lookup_role_by_name(api_server, role, False)
+        if remote_data:
+            role_info.update(remote_data)
+
+        metadata = get_role_metadata(role, options)
+        if metadata:
+            role_info.update(metadata)
+
+        role_spec = ansible.utils.role_spec_parse(role)
+        if role_spec:
+            role_info.update(role_spec)
+
+        if role_info:
+            print "- %s:" % (role)
+            for k in sorted(role_info.keys()):
+
+                if k in SKIP_INFO_KEYS:
+                    continue
+
+                if isinstance(role_info[k], dict):
+                    print "\t%s: " % (k)
+                    for key in sorted(role_info[k].keys()):
+                        if key in SKIP_INFO_KEYS:
+                            continue
+                        print "\t\t%s: %s" % (key, role_info[k][key])
+                else:
+                    print "\t%s: %s" % (k, role_info[k])
+        else:
+            print "- the role %s was not found" % role
+
+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)
+
+    if len(args) == 0 and role_file is None:
+        # 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 not role_file is None:
+        # 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_server = get_opt(options, "api_server", "galaxy.ansible.com")
+    no_deps    = get_opt(options, "no_deps", False)
+    roles_path = get_opt(options, "roles_path")
+
+    roles_done = []
+    if role_file:
+        f = open(role_file, 'r')
+        if role_file.endswith('.yaml') or role_file.endswith('.yml'):
+            roles_left = map(ansible.utils.role_yaml_parse, yaml.safe_load(f))
+        else:
+            # roles listed in a file, one per line
+            roles_left = map(ansible.utils.role_spec_parse, 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 = map(ansible.utils.role_spec_parse, args)
+
+    while len(roles_left) > 0:
+        # query the galaxy API for the role data
+        role_data = None
+        role = roles_left.pop(0)
+        role_src = role.get("src")
+        role_scm = role.get("scm")
+        role_path = role.get("path")
+
+        if role_path:
+            options.roles_path = role_path
+        else:
+            options.roles_path = roles_path
+
+        if os.path.isfile(role_src):
+            # installing a local tar.gz
+            tmp_file = role_src
+        else:
+            if role_scm:
+                # create tar file from scm url
+                tmp_file = scm_archive_role(role_scm, role_src, role.get("version"), role.get("name"))
+            elif '://' in role_src:
+                # just download a URL - version will probably be in the URL
+                tmp_file = fetch_role(role_src, None, None, options)
+            else:
+                # installing from galaxy
+                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)
+
+                role_data = api_lookup_role_by_name(api_server, role_src)
+                if not role_data:
+                    print "- sorry, %s was not found on %s." % (role_src, api_server)
+                    exit_without_ignore(options)
+                    continue
+
+                role_versions = api_fetch_role_related(api_server, 'versions', role_data['id'])
+                if "version" not in role or 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'
+                elif role['version'] != 'master':
+                    if role_versions and role["version"] not in [a.get('name', None) for a in role_versions]:
+                        print 'role is %s' % role
+                        print "- the specified version (%s) was not found in the list of available versions (%s)." % (role['version'], role_versions)
+                        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_src, role["version"], role_data, options)
+        installed = False
+        if tmp_file:
+            installed = install_role(role.get("name"), role.get("version"), tmp_file, options)
+            # we're done with the temp file, clean it up
+            if tmp_file != role_src:
+                os.unlink(tmp_file)
+            # install dependencies, if we want them
+            if not no_deps and installed:
+                if not role_data:
+                    role_data = get_role_metadata(role.get("name"), options)
+                    role_dependencies = role_data['dependencies']
+                else:
+                    role_dependencies = role_data['summary_fields']['dependencies'] # api_fetch_role_related(api_server, 'dependencies', role_data['id'])
+                for dep in role_dependencies:
+                    if isinstance(dep, basestring):
+                        dep = ansible.utils.role_spec_parse(dep)
+                    else:
+                        dep = ansible.utils.role_yaml_parse(dep)
+                    if not get_role_metadata(dep["name"], options):
+                        if dep not in roles_left:
+                            print '- adding dependency: %s' % dep["name"]
+                            roles_left.append(dep)
+                        else:
+                            print '- dependency %s already pending installation.' % dep["name"]
+                    else:
+                        print '- dependency %s is already installed, skipping.' % dep["name"]
+        if not tmp_file or not installed:
+            print "- %s was NOT installed successfully." % role.get("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,329 @@
+#!/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']
+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 sys
+import os
+import stat
+
+# Augment PYTHONPATH to find Python modules relative to this file path
+# This is so that we can find the modules when running from a local checkout
+# installed as editable with `pip install -e ...` or `python setup.py develop`
+local_module_path = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), '..', 'lib')
+)
+sys.path.append(local_module_path)
+
+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('-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('--list-tags', dest='listtags', action='store_true',
+        help="list all available tags")
+    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")
+    parser.add_option('--flush-cache', dest='flush_cache', action='store_true',
+        help="clear the fact cache")
+
+    options, args = parser.parse_args(args)
+
+    if len(args) == 0:
+        parser.print_help(file=sys.stderr)
+        return 1
+
+    # privlege escalation command line arguments need to be mutually exclusive
+    utils.check_mutually_exclusive_privilege(options, parser)
+
+    if (options.ask_vault_pass and options.vault_password_file):
+            parser.error("--ask-vault-pass and --vault-password-file are mutually exclusive")
+
+    sshpass = None
+    becomepass = None
+    vault_pass = None
+
+    options.ask_vault_pass = options.ask_vault_pass or C.DEFAULT_ASK_VAULT_PASS
+
+    if options.listhosts or options.syntax or options.listtasks or options.listtags:
+        (_, _, vault_pass) = utils.ask_passwords(ask_vault_pass=options.ask_vault_pass)
+    else:
+        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
+
+        # set pe options
+        utils.normalize_become_options(options)
+        prompt_method = utils.choose_pass_prompt(options)
+        (sshpass, becomepass, vault_pass) = utils.ask_passwords(ask_pass=options.ask_pass,
+                                                    become_ask_pass=options.become_ask_pass,
+                                                    ask_vault_pass=options.ask_vault_pass,
+                                                    become_method=prompt_method)
+
+    # read vault_pass from a file
+    if not options.ask_vault_pass and options.vault_password_file:
+        vault_pass = utils.read_vault_file(options.vault_password_file)
+
+    extra_vars = utils.parse_extra_vars(options.extra_vars, vault_pass)
+
+    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)
+
+    inventory = ansible.inventory.Inventory(options.inventory, vault_password=vault_pass)
+
+    # Note: slightly wrong, this is written so that implicit localhost
+    # (which is not returned in list_hosts()) is taken into account for
+    # warning if inventory is empty.  But it can't be taken into account for
+    # checking if limit doesn't match any hosts.  Instead we don't worry about
+    # limit if only implicit localhost was in inventory to start with.
+    #
+    # Fix this in v2
+    no_hosts = False
+    if len(inventory.list_hosts()) == 0:
+        # Empty inventory
+        utils.warning("provided hosts list is empty, only localhost is available")
+        no_hosts = True
+    inventory.subset(options.subset)
+    if len(inventory.list_hosts()) == 0 and no_hosts is False:
+        # Invalid limit
+        raise errors.AnsibleError("Specified --limit does not match any hosts")
+
+    # run all playbooks specified on the command line
+    for playbook in args:
+
+        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,
+            become=options.become,
+            become_method=options.become_method,
+            become_user=options.become_user,
+            become_pass=becomepass,
+            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,
+            vault_password=vault_pass,
+            force_handlers=options.force_handlers,
+        )
+
+        if options.flush_cache:
+            display(callbacks.banner("FLUSHING FACT CACHE"))
+            pb.SETUP_CACHE.flush()
+
+        if options.listhosts or options.listtasks or options.syntax or options.listtags:
+            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,
+                                              vault_password=pb.vault_password)
+                label = play.name
+                hosts = pb.inventory.list_hosts(play.hosts)
+
+                if options.listhosts:
+                    print '  play #%d (%s): host count=%d' % (playnum, label, len(hosts))
+                    for host in hosts:
+                        print '    %s' % host
+
+                if options.listtags or options.listtasks:
+                    print '  play #%d (%s):\tTAGS: [%s]' % (playnum, label,','.join(sorted(set(play.tags))))
+
+                    if options.listtags:
+                        tags = []
+                        for task in pb.tasks_to_run_in_play(play):
+                            tags.extend(task.tags)
+                        print '    TASK TAGS: [%s]' % (', '.join(sorted(set(tags).difference(['untagged']))))
+
+                    if options.listtasks:
+
+                        for task in pb.tasks_to_run_in_play(play):
+                            if getattr(task, 'name', None) is not None:
+                                # meta tasks have no names
+                                print '    %s\tTAGS: [%s]' % (task.name, ', '.join(sorted(set(task.tags).difference(['untagged']))))
+
+                if options.listhosts or options.listtasks or options.listtags:
+                    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 C.RETRY_FILES_ENABLED and 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,254 @@
+#!/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 sys
+import datetime
+import socket
+import random
+import time
+from ansible import utils
+from ansible.utils import cmd_functions
+from ansible import errors
+from ansible import inventory
+
+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')
+    parser.add_option('-t', '--tags', dest='tags', default=False,
+                      help='only run plays and tasks tagged with these values')
+    parser.add_option('--accept-host-key', default=False, dest='accept_host_key', action='store_true',
+                      help='adds the hostkey for the repo url if not already added')
+    parser.add_option('--key-file', dest='key_file',
+                      help="Pass '-i <key_file>' to the SSH arguments used by git.")
+    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 now.strftime("Starting ansible-pull at %F %T")
+
+    # Attempt to use the inventory passed in as an argument
+    # It might not yet have been downloaded so use localhost if note
+    if not options.inventory or not os.path.exists(options.inventory):
+        inv_opts = 'localhost,'
+    else:
+        inv_opts = options.inventory
+    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
+
+    # Only git module is supported
+    if options.module_name == DEFAULT_REPO_TYPE:
+        if options.accept_host_key:
+            repo_opts += ' accept_hostkey=yes'
+
+        if options.key_file:
+            repo_opts += ' key_file=%s' % options.key_file
+
+    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 localhost -i "%s" %s -m %s -a "%s"' % (
+            inv_opts, base_opts, options.module_name, repo_opts
+            )
+    for ev in options.extra_vars:
+        cmd += ' -e "%s"' % ev
+
+    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 >>sys.stderr, "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'
+    if options.tags:
+        cmd += ' -t "%s"' % options.tags
+    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-vault

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

bin/ansible-vault

@@ -0,0 +1,241 @@
+#!/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-vault is a script that encrypts/decrypts YAML files. See
+# http://docs.ansible.com/playbooks_vault.html for more details.
+
+__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 sys
+import traceback
+
+import ansible.constants as C
+
+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", "view")
+
+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", default=C.DEFAULT_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 == "view":
+        parser.set_usage("usage: %prog view [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 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 = utils.read_vault_file(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 = utils.read_vault_file(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("edit 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 = utils.read_vault_file(options.password_file)
+
+    cipher = None
+
+    for f in args:
+        this_editor = VaultEditor(cipher, password, f)
+        this_editor.edit_file()
+
+def execute_view(args, options, parser):
+
+    if len(args) > 1:
+        raise errors.AnsibleError("view 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 = utils.read_vault_file(options.password_file)
+
+    cipher = None
+
+    for f in args:
+        this_editor = VaultEditor(cipher, password, f)
+        this_editor.view_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 = utils.read_vault_file(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 = utils.read_vault_file(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()
+
+    if not len(args):
+        raise errors.AnsibleError(
+            "The '%s' command requires a filename as the first argument" % action
+        ) 
+
+    # 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,333 +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'

changelogs/CHANGELOG-v2.6.rst

@@ -1,519 +0,0 @@
-========================================
-Ansible 2.6 "Heartbreaker" Release Notes
-========================================
-
-v2.6.0
-======
-
-Release Summary
----------------
-
-| Release Date: 2018-06-28
-| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_
-
-
-Minor Changes
--------------
-
-- Added an ``encoding`` option to the ``b64encode`` and ``b64decode`` filters to specify the encoding of the string that is base64 encoded.
-- PowerShell modules that use Convert-ToSID in Ansible.ModuleUtils.SID.psm1 like win_user_right now accept an actual SID as an input string. This means any local or domain accounts that are named like a SID need to be prefixed with the domain, hostname, or . to ensure it converts to that accounts SID https://github.com/ansible/ansible/issues/38502
-- Raise AnsibleParserError which was missing previously
-- The aws_ses_identity module supports check mode
-- `postgresql_user` module changed `encrypted=yes` to be the default. This shouldn't break any current playbooks, the module will just store passwords hashed by default. This change was done because Postgres 10 dropped support for `UNENCRYPTED` passwords and because all versions since Postgres 7.2 support storing encrypted passwords.
-- azure_rm_loadbalancer - add support for sku
-- azure_rm_publicipaddress - add support for sku
-- cloudflare_dns module - Removed restriction from protocol to allow other protocols than tcp and udp to be specified.
-- command module - Added argv option to allow command to be specified as a list vs. a string (https://github.com/ansible/ansible/issues/19392)
-- gem - add ability to specify a custom directory for installing gems (https://github.com/ansible/ansible/pull/38195)
-- import/include - Cache task_vars to speed up IncludedFile.process_include_results (https://github.com/ansible/ansible/pull/39026)
-- postgresql_user module - Changed encrypted=yes to be the default. This shouldn't break any current playbooks, the module will just store passwords hashed by default. This change was done because Postgres 10 dropped support for UNENCRYPTED passwords and because all versions since Postgres 7.2 support storing encrypted passwords.
-- vmware_target_canonical_facts module - The target_id parameter is an optional parameter.
-
-Deprecated Features
--------------------
-
-- nxos_igmp_interface module - The oif_prefix and oif_source properties are deprecated. Use the oif_ps parameter with a dictionary of prefix and source to values instead.
-
-Removed Features (previously deprecated)
-----------------------------------------
-
-- removed the deprecated always_run task option, please use `check_mode: no` instead
-- win_chocolatey - removed deprecated upgrade option and choco_* output return values
-- win_feature - removed deprecated reboot option
-- win_iis_webapppool - removed the ability to supply attributes as a string in favour of a dictionary
-- win_package - removed deprecated name option
-- win_regedit - removed deprecated support for specifying HKCC as HCCC
-
-Bugfixes
---------
-
-- **Security Fix** - Some connection exceptions would cause no_log specified on a task to be ignored.  If this happened, the task information, including any private information could have been displayed to stdout and (if enabled, not the default) logged to a log file specified in ansible.cfg's log_path. Additionally, sites which redirected stdout from ansible runs to a log file may have stored that private information onto disk that way as well. (https://github.com/ansible/ansible/pull/41414)
-- Changed the admin_users config option to not include "admin" by default as admin is frequently used for a non-privileged account  (https://github.com/ansible/ansible/pull/41164)
-- Changed the output to "text" for "show vrf" command as default "json" output format with respect to "eapi" transport was failing (https://github.com/ansible/ansible/pull/41470)
-- Document mode=preserve for both the copy and template module
-- Fix added for Digital Ocean Volumes API change causing Ansible to recieve an unexpected value in the response. (https://github.com/ansible/ansible/pull/41431)
-- Fix an encoding issue when parsing the examples from a plugins' documentation
-- Fix iosxr_config module to handle route-policy, community-set, prefix-set, as-path-set and rd-set blocks. All these blocks are part of route-policy language of iosxr.
-- Fix mode=preserve with remote_src=True for the copy module
-- Implement mode=preserve for the template module
-- The yaml callback plugin now allows non-ascii characters to be displayed.
-- Various grafana_* modules - Port away from the deprecated b64encodestring function to the b64encode function instead. https://github.com/ansible/ansible/pull/38388
-- added missing 'raise' to exception definition https://github.com/ansible/ansible/pull/41690
-- allow custom endpoints to be used in the aws_s3 module (https://github.com/ansible/ansible/pull/36832)
-- allow set_options to be called multiple times https://github.com/ansible/ansible/pull/41913
-- ansible-doc - fixed traceback on missing plugins (https://github.com/ansible/ansible/pull/41167)
-- cast the device_mapping volume size to an int in the ec2_ami module (https://github.com/ansible/ansible/pull/40938)
-- copy - fixed copy to only follow symlinks for files in the non-recursive case
-- copy module - The copy module was attempting to change the mode of files for remote_src=True even if mode was not set as a parameter.  This failed on filesystems which do not have permission bits (https://github.com/ansible/ansible/pull/40099)
-- copy module - fixed recursive copy with relative paths (https://github.com/ansible/ansible/pull/40166)
-- correct debug display for all cases https://github.com/ansible/ansible/pull/41331
-- correctly check hostvars for vars term https://github.com/ansible/ansible/pull/41819
-- correctly handle yaml inventory files when entries are null dicts https://github.com/ansible/ansible/issues/41692
-- dynamic includes - Allow inheriting attributes from static parents (https://github.com/ansible/ansible/pull/38827)
-- dynamic includes - Don't treat undefined vars for conditional includes as truthy (https://github.com/ansible/ansible/pull/39377)
-- dynamic includes - Fix IncludedFile comparison for free strategy (https://github.com/ansible/ansible/pull/37083)
-- dynamic includes - Improved performance by fixing re-parenting on copy (https://github.com/ansible/ansible/pull/38747)
-- dynamic includes - Use the copied and merged task for calculating task vars (https://github.com/ansible/ansible/pull/39762)
-- file - fixed the default follow behaviour of file to be true
-- file module - Eliminate an error if we're asked to remove a file but something removes it while we are processing the request (https://github.com/ansible/ansible/pull/39466)
-- file module - Fix error when recursively assigning permissions and a symlink to a nonexistent file is present in the directory tree (https://github.com/ansible/ansible/issues/39456)
-- file module - Fix error when running a task which assures a symlink to a nonexistent file exists for the second and subsequent times (https://github.com/ansible/ansible/issues/39558)
-- file module - The file module allowed the user to specify src as a parameter when state was not link or hard.  This is documented as only applying to state=link or state=hard but in previous Ansible, this could have an effect in rare cornercases.  For instance, "ansible -m file -a 'state=directory path=/tmp src=/var/lib'" would create /tmp/lib.  This has been disabled and a warning emitted (will change to an error in Ansible-2.10).
-- file module - The touch subcommand had its diff output broken during the 2.6.x development cycle.  This is now fixed (https://github.com/ansible/ansible/issues/41755)
-- fix BotoCoreError exception handling
-- fix apt-mark on debian6 (https://github.com/ansible/ansible/pull/41530)
-- fix async for the aws_s3 module by adding async support to the action plugin (https://github.com/ansible/ansible/pull/40826)
-- fix decrypting vault files for the aws_s3 module (https://github.com/ansible/ansible/pull/39634)
-- fix errors with S3-compatible APIs if they cannot use ACLs for buckets or objects
-- fix permission handling to try to download a file even if the user does not have permission to list all objects in the bucket
-- fixed config required handling, specifically for _terms in lookups https://github.com/ansible/ansible/pull/41740
-- gce_net - Fix sorting of allowed ports (https://github.com/ansible/ansible/pull/41567)
-- group_by - support implicit localhost (https://github.com/ansible/ansible/pull/41860)
-- import/include - Ensure role handlers have the proper parent, allowing for correct attribute inheritance (https://github.com/ansible/ansible/pull/39426)
-- import_playbook - Pass vars applied to import_playbook into parsing of the playbook as they may be needed to parse the imported plays (https://github.com/ansible/ansible/pull/39521)
-- include_role/import_role - Don't overwrite included role handlers with play handlers on parse (https://github.com/ansible/ansible/pull/39563)
-- include_role/import_role - Fix parameter templating (https://github.com/ansible/ansible/pull/36372)
-- include_role/import_role - Use the computed role name for include_role/import_role so to diffentiate between names computed from host vars (https://github.com/ansible/ansible/pull/39516)
-- include_role/import_role - improved performance and recursion depth (https://github.com/ansible/ansible/pull/36470)
-- lineinfile - fix insertbefore when used with BOF to not insert duplicate lines (https://github.com/ansible/ansible/issues/38219)
-- password lookup - Do not load password lookup in network filters, allowing the password lookup to be overriden (https://github.com/ansible/ansible/pull/41907)
-- pause - ensure ctrl+c interrupt works in all cases (https://github.com/ansible/ansible/issues/35372)
-- powershell - use the tmpdir set by `remote_tmp` for become/async tasks instead of the generic $env:TEMP - https://github.com/ansible/ansible/pull/40210
-- selinux - correct check mode behavior to report same changes as normal mode (https://github.com/ansible/ansible/pull/40721)
-- spwd - With python 3.6 spwd.getspnam returns PermissionError instead of KeyError if user does not have privileges (https://github.com/ansible/ansible/issues/39472)
-- synchronize - Ensure the local connection created by synchronize uses _remote_is_local=True, which causes ActionBase to build a local tmpdir (https://github.com/ansible/ansible/pull/40833)
-- template - Fix for encoding issues when a template path contains non-ascii characters and using the template path in ansible_managed (https://github.com/ansible/ansible/issues/27262)
-- template action plugin - fix the encoding of filenames to avoid tracebacks on Python2 when characters that are not present in the user's locale are present. (https://github.com/ansible/ansible/pull/39424)
-- user - only change the expiration time when necessary (https://github.com/ansible/ansible/issues/13235)
-- uses correct conn info for reset_connection  https://github.com/ansible/ansible/issues/27520
-- win_environment - Fix for issue where the environment value was deleted when a null value or empty string was set - https://github.com/ansible/ansible/issues/40450
-- win_file - fix issue where special chars like [ and ] were not being handled correctly https://github.com/ansible/ansible/pull/37901
-- win_get_url - fixed a few bugs around authentication and force no when using an FTP URL
-- win_iis_webapppool - redirect some module output to null so Ansible can read the output JSON https://github.com/ansible/ansible/issues/40874
-- win_template - fix when specifying the dest option as a directory with and without the trailing slash https://github.com/ansible/ansible/issues/39886
-- win_updates - Added the ability to run on a scheduled task for older hosts so async starts working again - https://github.com/ansible/ansible/issues/38364
-- win_updates - Fix logic when using a whitelist for multiple updates
-- win_updates - Fix typo that hid the download error when a download failed
-- win_updates - Fixed issue where running win_updates on async fails without any error
-- windows become - Show better error messages when the become process fails
-- winrm - Add better error handling when the kinit process fails
-- winrm - allow `ansible_user` or `ansible_winrm_user` to override `ansible_ssh_user` when both are defined in an inventory - https://github.com/ansible/ansible/issues/39844
-- winrm - ensure pexpect is set to not echo the input on a failure and have a manual sanity check afterwards https://github.com/ansible/ansible/issues/41865
-- winrm connection plugin - Fix exception messages sometimes raising a traceback when the winrm connection plugin encounters an unrecoverable error.  https://github.com/ansible/ansible/pull/39333
-- xenserver_facts - ensure module works with newer versions of XenServer (https://github.com/ansible/ansible/pull/35821)
-
-New Plugins
------------
-
-Callback
-~~~~~~~~
-
-- cgroup_memory_recap - Profiles maximum memory usage of tasks and full execution using cgroups
-- grafana_annotations - send ansible events as annotations on charts to grafana over http api.
-- sumologic - Sends task result events to Sumologic
-
-Connection
-~~~~~~~~~~
-
-- httpapi - Use httpapi to run command on network appliances
-
-Inventory
-~~~~~~~~~
-
-- foreman - foreman inventory source
-- gcp_compute - Google Cloud Compute Engine inventory source
-- generator - Uses Jinja2 to construct hosts and groups from patterns
-- nmap - Uses nmap to find hosts to target
-
-Lookup
-~~~~~~
-
-- onepassword - fetch field values from 1Password
-- onepassword_raw - fetch raw json data from 1Password
-
-New Modules
------------
-
-Cloud
-~~~~~
-
-amazon
-^^^^^^
-
-- aws_caller_facts - Get facts about the user and account being used to make AWS calls.
-- aws_config_aggregation_authorization - Manage cross-account AWS Config authorizations
-- aws_config_aggregator - Manage AWS Config aggregations across multiple accounts
-- aws_config_delivery_channel - Manage AWS Config delivery channels
-- aws_config_recorder - Manage AWS Config Recorders
-- aws_config_rule - Manage AWS Config resources
-- aws_glue_connection - Manage an AWS Glue connection
-- aws_glue_job - Manage an AWS Glue job
-- aws_inspector_target - Create, Update and Delete Amazon Inspector Assessment Targets
-- aws_ses_identity_policy - Manages SES sending authorization policies
-- aws_sgw_facts - Fetch AWS Storage Gateway facts
-- ec2_eip_facts - List EC2 EIP details
-- ec2_vpc_vpn_facts - Gather facts about VPN Connections in AWS.
-- elb_network_lb - Manage a Network Load Balancer
-- rds_instance_facts - obtain facts about one or more RDS instances
-- rds_snapshot_facts - obtain facts about one or more RDS snapshots
-
-azure
-^^^^^
-
-- azure_rm_aks - Manage a managed Azure Container Service (AKS) Instance.
-- azure_rm_aks_facts - Get Azure Kubernetes Service facts.
-- azure_rm_resource - Create any Azure resource.
-- azure_rm_resource_facts - Generic facts of Azure resources.
-
-cloudstack
-^^^^^^^^^^
-
-- cs_role_permission - Manages role permissions on Apache CloudStack based clouds.
-
-digital_ocean
-^^^^^^^^^^^^^
-
-- digital_ocean_account_facts - Gather facts about DigitalOcean User account
-- digital_ocean_certificate_facts - Gather facts about DigitalOcean certificates
-- digital_ocean_domain_facts - Gather facts about DigitalOcean Domains
-- digital_ocean_image_facts - Gather facts about DigitalOcean images
-- digital_ocean_load_balancer_facts - Gather facts about DigitalOcean load balancers
-- digital_ocean_region_facts - Gather facts about DigitalOcean regions
-- digital_ocean_size_facts - Gather facts about DigitalOcean Droplet sizes
-- digital_ocean_snapshot_facts - Gather facts about DigitalOcean Snapshot
-- digital_ocean_tag_facts - Gather facts about DigitalOcean tags
-- digital_ocean_volume_facts - Gather facts about DigitalOcean volumes
-
-google
-^^^^^^
-
-- gcp_compute_address - Creates a GCP Address
-- gcp_compute_backend_bucket - Creates a GCP BackendBucket
-- gcp_compute_backend_service - Creates a GCP BackendService
-- gcp_compute_disk - Creates a GCP Disk
-- gcp_compute_firewall - Creates a GCP Firewall
-- gcp_compute_forwarding_rule - Creates a GCP ForwardingRule
-- gcp_compute_global_address - Creates a GCP GlobalAddress
-- gcp_compute_global_forwarding_rule - Creates a GCP GlobalForwardingRule
-- gcp_compute_health_check - Creates a GCP HealthCheck
-- gcp_compute_http_health_check - Creates a GCP HttpHealthCheck
-- gcp_compute_https_health_check - Creates a GCP HttpsHealthCheck
-- gcp_compute_image - Creates a GCP Image
-- gcp_compute_instance - Creates a GCP Instance
-- gcp_compute_instance_group - Creates a GCP InstanceGroup
-- gcp_compute_instance_group_manager - Creates a GCP InstanceGroupManager
-- gcp_compute_instance_template - Creates a GCP InstanceTemplate
-- gcp_compute_network - Creates a GCP Network
-- gcp_compute_route - Creates a GCP Route
-- gcp_compute_ssl_certificate - Creates a GCP SslCertificate
-- gcp_compute_subnetwork - Creates a GCP Subnetwork
-- gcp_compute_target_http_proxy - Creates a GCP TargetHttpProxy
-- gcp_compute_target_https_proxy - Creates a GCP TargetHttpsProxy
-- gcp_compute_target_pool - Creates a GCP TargetPool
-- gcp_compute_target_ssl_proxy - Creates a GCP TargetSslProxy
-- gcp_compute_target_tcp_proxy - Creates a GCP TargetTcpProxy
-- gcp_compute_url_map - Creates a GCP UrlMap
-- gcp_container_cluster - Creates a GCP Cluster
-- gcp_container_node_pool - Creates a GCP NodePool
-- gcp_dns_resource_record_set - Creates a GCP ResourceRecordSet
-- gcp_pubsub_subscription - Creates a GCP Subscription
-- gcp_pubsub_topic - Creates a GCP Topic
-- gcp_storage_bucket - Creates a GCP Bucket
-- gcp_storage_bucket_access_control - Creates a GCP BucketAccessControl
-
-heroku
-^^^^^^
-
-- heroku_collaborator - Add or delete app collaborators on Heroku
-
-memset
-^^^^^^
-
-- memset_dns_reload - Request reload of Memset's DNS infrastructure,
-- memset_zone - Creates and deletes Memset DNS zones.
-- memset_zone_domain - Create and delete domains in Memset DNS zones.
-- memset_zone_record - Create and delete records in Memset DNS zones.
-
-misc
-^^^^
-
-- cloud_init_data_facts - Retrieve facts of cloud-init.
-
-opennebula
-^^^^^^^^^^
-
-- one_host - Manages OpenNebula Hosts
-- one_image - Manages OpenNebula images
-- one_image_facts - Gather facts about OpenNebula images
-- one_service - Deploy and manage OpenNebula services
-- one_vm - Creates or terminates OpenNebula instances
-
-openstack
-^^^^^^^^^
-
-- os_server_metadata - Add/Update/Delete Metadata in Compute Instances from OpenStack
-- os_volume_snapshot - Create/Delete Cinder Volume Snapshots
-
-scaleway
-^^^^^^^^
-
-- scaleway_compute - Scaleway compute management module
-- scaleway_sshkey - Scaleway SSH keys management module
-
-vmware
-^^^^^^
-
-- vmware_cluster_facts - Gather facts about clusters available in given vCenter
-- vmware_datastore_cluster - Manage VMware vSphere datastore clusters
-- vmware_datastore_maintenancemode - Place a datastore into maintenance mode
-- vmware_guest_disk_facts - Gather facts about disks of given virtual machine
-- vmware_guest_snapshot_facts - Gather facts about virtual machine's snapshots in vCenter
-- vmware_host_capability_facts - Gathers facts about an ESXi host's capability information
-- vmware_host_powerstate - Manages power states of host systems in vCenter
-- vmware_local_user_facts - Gather facts about users on the given ESXi host
-- vmware_portgroup_facts - Gathers facts about an ESXi host's portgroup configuration
-- vmware_resource_pool_facts - Gathers facts about resource pool information
-- vmware_tag - Manage VMware tags
-- vmware_tag_facts - Manage VMware tag facts
-- vmware_vswitch_facts - Gathers facts about an ESXi host's vswitch configurations
-
-Clustering
-~~~~~~~~~~
-
-k8s
-^^^
-
-- k8s - Manage Kubernetes (K8s) objects
-
-Commands
-~~~~~~~~
-
-- psexec - Runs commands on a remote Windows host based on the PsExec model
-
-Monitoring
-~~~~~~~~~~
-
-- spectrum_device - Creates/deletes devices in CA Spectrum.
-
-zabbix
-^^^^^^
-
-- zabbix_group_facts - Gather facts about Zabbix hostgroup
-
-Net Tools
-~~~~~~~~~
-
-ldap
-^^^^
-
-- ldap_passwd - Set passwords in LDAP.
-
-Network
-~~~~~~~
-
-aci
-^^^
-
-- aci_l3out - Manage Layer 3 Outside (L3Out) objects (l3ext:Out)
-
-avi
-^^^
-
-- avi_autoscalelaunchconfig - Module for setup of AutoScaleLaunchConfig Avi RESTful Object
-- avi_l4policyset - Module for setup of L4PolicySet Avi RESTful Object
-- avi_useraccount - Avi UserAccount Module
-
-cnos
-^^^^
-
-- cnos_command - Run arbitrary commands on Lenovo CNOS devices
-- cnos_config - Manage Lenovo CNOS configuration sections
-
-exos
-^^^^
-
-- exos_command - Run commands on remote devices running Extreme EXOS
-
-f5
-^^
-
-- bigip_data_group - Manage data groups on a BIG-IP
-- bigip_device_license - Manage license installation and activation on BIG-IP devices
-- bigip_gtm_global - Manages global GTM settings
-- bigip_gtm_monitor_bigip - Manages F5 BIG-IP GTM BIG-IP monitors
-- bigip_gtm_monitor_external - Manages external GTM monitors on a BIG-IP
-- bigip_gtm_monitor_firepass - Manages F5 BIG-IP GTM FirePass monitors
-- bigip_gtm_monitor_http - Manages F5 BIG-IP GTM http monitors
-- bigip_gtm_monitor_https - Manages F5 BIG-IP GTM https monitors
-- bigip_gtm_monitor_tcp - Manages F5 BIG-IP GTM tcp monitors
-- bigip_gtm_monitor_tcp_half_open - Manages F5 BIG-IP GTM tcp half-open monitors
-- bigip_gtm_pool_member - Manage GTM pool member settings
-- bigip_gtm_virtual_server - Manages F5 BIG-IP GTM virtual servers
-- bigip_log_destination - Manages log destinations on a BIG-IP.
-- bigip_log_publisher - Manages log publishers on a BIG-IP
-- bigip_management_route - Manage system management routes on a BIG-IP
-- bigip_monitor_external - Manages external LTM monitors on a BIG-IP
-- bigip_profile_dns - Manage DNS profiles on a BIG-IP
-- bigip_profile_tcp - Manage TCP profiles on a BIG-IP
-- bigip_profile_udp - Manage UDP profiles on a BIG-IP
-- bigip_service_policy - Manages service policies on a BIG-IP.
-- bigip_smtp - Manages SMTP settings on the BIG-IP
-- bigip_snmp_community - Manages SNMP communities on a BIG-IP.
-- bigip_timer_policy - Manage timer policies on a BIG-IP
-- bigip_trunk - Manage trunks on a BIG-IP
-- bigiq_application_fasthttp - Manages BIG-IQ FastHTTP applications
-- bigiq_application_fastl4_tcp - Manages BIG-IQ FastL4 TCP applications
-- bigiq_application_fastl4_udp - Manages BIG-IQ FastL4 UDP applications
-- bigiq_application_http - Manages BIG-IQ HTTP applications
-- bigiq_application_https_offload - Manages BIG-IQ HTTPS offload applications
-- bigiq_application_https_waf - Manages BIG-IQ HTTPS WAF applications
-- bigiq_regkey_license_assignment - Manage regkey license assignment on BIG-IPs from a BIG-IQ.
-- bigiq_utility_license - Manage utility licenses on a BIG-IQ
-
-files
-^^^^^
-
-- net_get - Copy files from a network device to Ansible Controller
-- net_put - Copy files from Ansibe controller to a network device
-
-fortios
-^^^^^^^
-
-- fortios_webfilter - Configure webfilter capabilities of FortiGate and FortiOS.
-
-meraki
-^^^^^^
-
-- meraki_admin - Manage administrators in the Meraki cloud
-- meraki_network - Manage networks in the Meraki cloud
-- meraki_organization - Manage organizations in the Meraki cloud
-- meraki_snmp - Manage organizations in the Meraki cloud
-
-netconf
-^^^^^^^
-
-- netconf_get - Fetch configuration/state data from NETCONF enabled network devices.
-- netconf_rpc - Execute operations on NETCONF enabled network devices.
-
-slxos
-^^^^^
-
-- slxos_command - Run commands on remote devices running Extreme Networks SLX-OS
-- slxos_config - Manage Extreme Networks SLX-OS configuration sections
-- slxos_facts - Collect facts from devices running Extreme SLX-OS
-- slxos_interface - Manage Interfaces on Extreme SLX-OS network devices
-- slxos_l2_interface - Manage Layer-2 interface on Extreme Networks SLXOS devices.
-- slxos_l3_interface - Manage L3 interfaces on Extreme Networks SLXOS network devices.
-- slxos_linkagg - Manage link aggregation groups on Extreme Networks SLXOS network devices
-- slxos_vlan - Manage VLANs on Extreme Networks SLX-OS network devices
-
-Packaging
-~~~~~~~~~
-
-language
-^^^^^^^^
-
-- yarn - Manage node.js packages with Yarn
-
-os
-^^
-
-- flatpak - Manage flatpaks
-- flatpak_remote - Manage flatpak repository remotes
-
-Source Control
-~~~~~~~~~~~~~~
-
-- gitlab_deploy_key - Manages GitLab project deploy keys.
-- gitlab_hooks - Manages GitLab project hooks.
-
-Storage
-~~~~~~~
-
-glusterfs
-^^^^^^^^^
-
-- gluster_peer - Attach/Detach peers to/from the cluster
-
-netapp
-^^^^^^
-
-- na_ontap_aggregate - Manage NetApp ONTAP aggregates.
-- na_ontap_broadcast_domain - Manage NetApp ONTAP broadcast domains.
-- na_ontap_broadcast_domain_ports - Manage NetApp Ontap broadcast domain ports
-- na_ontap_cifs - Manage NetApp cifs-share
-- na_ontap_cifs_acl - Manage NetApp cifs-share-access-control
-- na_ontap_cifs_server - cifs server configuration
-- na_ontap_cluster - Create/Join ONTAP cluster. Apply license to cluster
-- na_ontap_cluster_ha - Manage HA status for cluster
-- na_ontap_export_policy - Manage NetApp ONTAP export-policy
-- na_ontap_export_policy_rule - Manage ONTAP Export rules
-- na_ontap_igroup - ONTAP iSCSI igroup configuration
-- na_ontap_interface - ONTAP LIF configuration
-- na_ontap_iscsi - Manage NetApp Ontap iscsi service
-- na_ontap_job_schedule - Manage NetApp Ontap Job Schedule
-- na_ontap_license - Manage NetApp ONTAP protocol and feature licenses
-- na_ontap_lun - Manage  NetApp Ontap luns
-- na_ontap_lun_map - Manage NetApp Ontap lun maps
-- na_ontap_net_ifgrp - Create, modify, destroy the network interface group
-- na_ontap_net_port - Manage NetApp Ontap network ports.
-- na_ontap_net_routes - Manage NetApp Ontap network routes
-- na_ontap_net_vlan - Manage NetApp Ontap network vlan
-- na_ontap_nfs - Manage Ontap NFS status
-- na_ontap_ntp - Create/Delete/modify_version ONTAP NTP server
-- na_ontap_qtree - Manage qtrees
-- na_ontap_service_processor_network - Manage NetApp Ontap service processor network
-- na_ontap_snapshot - Manage NetApp Sanpshots
-- na_ontap_snmp - Manage NetApp SNMP community
-- na_ontap_svm - Manage NetApp Ontap svm
-- na_ontap_ucadapter - ONTAP UC adapter configuration
-- na_ontap_user - useradmin configuration and management
-- na_ontap_user_role - useradmin configuration and management
-- na_ontap_volume - Manage NetApp ONTAP volumes.
-- na_ontap_volume_clone - Manage NetApp Ontap volume clones.
-
-purestorage
-^^^^^^^^^^^
-
-- purefa_ds - Configure FlashArray Directory Service
-- purefa_facts - Collect facts from Pure Storage FlashArray
-- purefa_pgsnap - Manage protection group snapshots on Pure Storage FlashArrays
-- purefb_fs - Manage filesystemon Pure Storage FlashBlade`
-- purefb_snap - Manage filesystem snapshots on Pure Storage FlashBlades
-
-System
-~~~~~~
-
-- sysvinit - Manage SysV services.
-
-Web Infrastructure
-~~~~~~~~~~~~~~~~~~
-
-- acme_account - Create, modify or delete accounts with Let's Encrypt
-
-Windows
-~~~~~~~
-
-- win_domain_computer - Manage computers in Active Directory
-- win_hostname - Manages local Windows computer name.
-- win_pester - Run Pester tests on Windows hosts

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/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/admin-users-default-change.yaml

@@ -1,4 +0,0 @@
----
-bugfixes:
-  - Changed the admin_users config option to not include "admin" by default as
-    admin is frequently used for a non-privileged account  (https://github.com/ansible/ansible/pull/41164)

changelogs/fragments/always_run_removal.yaml

@@ -1,2 +0,0 @@
-removed_features:
-- "removed the deprecated always_run task option, please use `check_mode: no` instead"

changelogs/fragments/ansible-managed-encoding.yaml

@@ -1,5 +0,0 @@
----
-bugfixes:
-- template - Fix for encoding issues when a template path contains non-ascii
-  characters and using the template path in ansible_managed
-  (https://github.com/ansible/ansible/issues/27262)

changelogs/fragments/aws_s3_async_fix.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- fix async for the aws_s3 module by adding async support to the action plugin (https://github.com/ansible/ansible/pull/40826)

changelogs/fragments/aws_s3_decryption_fix.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- fix decrypting vault files for the aws_s3 module (https://github.com/ansible/ansible/pull/39634)

changelogs/fragments/aws_s3_fix_custom_endpoints.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- allow custom endpoints to be used in the aws_s3 module (https://github.com/ansible/ansible/pull/36832)

changelogs/fragments/aws_s3_fix_exception_handling.yaml

@@ -1,5 +0,0 @@
----
-bugfixes:
-  - fix permission handling to try to download a file even if the user does not have permission to list all objects in the bucket
-  - fix BotoCoreError exception handling
-  - fix errors with S3-compatible APIs if they cannot use ACLs for buckets or objects

changelogs/fragments/aws_ses_identity_check_mode.yaml

@@ -1,2 +0,0 @@
-minor_changes:
-  - The aws_ses_identity module supports check mode

changelogs/fragments/azure-lb-sku.yaml

@@ -1,3 +0,0 @@
-minor_changes:
-- azure_rm_loadbalancer - add support for sku
-- azure_rm_publicipaddress - add support for sku

changelogs/fragments/base64_filter_encoding.yaml

@@ -1,3 +0,0 @@
-minor_changes:
-- Added an ``encoding`` option to the ``b64encode`` and ``b64decode`` filters
-  to specify the encoding of the string that is base64 encoded.

changelogs/fragments/command-support-argv.yaml

@@ -1,4 +0,0 @@
----
-minor_changes:
-  - command module - Added argv option to allow command to be specified as a list vs. a string
-    (https://github.com/ansible/ansible/issues/19392)

changelogs/fragments/copy-files-default-follow.yaml

@@ -1,4 +0,0 @@
----
-bugfixes:
-- copy - fixed copy to only follow symlinks for files in the non-recursive case
-- file - fixed the default follow behaviour of file to be true

changelogs/fragments/copy-no-chmod.yaml

@@ -1,5 +0,0 @@
----
-bugfixes:
-- copy module - The copy module was attempting to change the mode of files for
-  remote_src=True even if mode was not set as a parameter.  This failed on
-  filesystems which do not have permission bits (https://github.com/ansible/ansible/pull/40099)

changelogs/fragments/copy-recursive-copy.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- copy module - fixed recursive copy with relative paths (https://github.com/ansible/ansible/pull/40166)

changelogs/fragments/debug_fixes.yml

@@ -1,2 +0,0 @@
-bugfixes:
-    - correct debug display for all cases https://github.com/ansible/ansible/pull/41331

changelogs/fragments/digital_ocean_block_storage_fix.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- Fix added for Digital Ocean Volumes API change causing Ansible to recieve an unexpected value in the response. (https://github.com/ansible/ansible/pull/41431)

changelogs/fragments/ec2_ami_fix_block_device_mapping_volume_size_type.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- cast the device_mapping volume size to an int in the ec2_ami module (https://github.com/ansible/ansible/pull/40938)

changelogs/fragments/encoding-docs-plugin-parsing.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- Fix an encoding issue when parsing the examples from a plugins' documentation

changelogs/fragments/eos_vrf_failure-fix.yml

@@ -1,4 +0,0 @@
----
-bugfixes:
-  - Changed the output to "text" for "show vrf" command as default "json" output format
-    with respect to "eapi" transport was failing (https://github.com/ansible/ansible/pull/41470)

changelogs/fragments/file-disallow-src.yaml

@@ -1,8 +0,0 @@
----
-bugfixes:
-- file module - The file module allowed the user to specify src as a parameter
-  when state was not link or hard.  This is documented as only applying to
-  state=link or state=hard but in previous Ansible, this could have an effect
-  in rare cornercases.  For instance, "ansible -m file -a 'state=directory
-  path=/tmp src=/var/lib'" would create /tmp/lib.  This has been disabled and
-  a warning emitted (will change to an error in Ansible-2.10).

changelogs/fragments/file-nonexistent-link.yaml

@@ -1,5 +0,0 @@
----
-bugfixes:
-  - file module - Fix error when running a task which assures a symlink to
-    a nonexistent file exists for the second and subsequent times
-    (https://github.com/ansible/ansible/issues/39558)

changelogs/fragments/file-nonexitent-link-recurse.yaml

@@ -1,5 +0,0 @@
----
-bugfixes:
-  - file module - Fix error when recursively assigning permissions and
-    a symlink to a nonexistent file is present in the directory tree
-    (https://github.com/ansible/ansible/issues/39456)

changelogs/fragments/file-succeed-if-already-absent.yaml

@@ -1,5 +0,0 @@
----
-bugfixes:
-- file module - Eliminate an error if we're asked to remove a file but
-  something removes it while we are processing the request
-  (https://github.com/ansible/ansible/pull/39466)

changelogs/fragments/file_touch_diff.yaml

@@ -1,4 +0,0 @@
----
-bugfixes:
-- file module - The touch subcommand had its diff output broken during the
-  2.6.x development cycle.  This is now fixed (https://github.com/ansible/ansible/issues/41755)

changelogs/fragments/fix_config_required.yml

@@ -1,2 +0,0 @@
-bugfixes:
-    - fixed config required handling, specifically for _terms in lookups https://github.com/ansible/ansible/pull/41740

changelogs/fragments/fix_options.yml

@@ -1,2 +0,0 @@
-bugfixes:
-    - allow set_options to be called multiple times https://github.com/ansible/ansible/pull/41913

changelogs/fragments/fix_password_lookup_loading.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- password lookup - Do not load password lookup in network filters, allowing the password lookup to be overriden (https://github.com/ansible/ansible/pull/41907)

changelogs/fragments/fix_yaml_inv_nulls.yml

@@ -1,2 +0,0 @@
-bugfixes:
-    - correctly handle yaml inventory files when entries are null dicts https://github.com/ansible/ansible/issues/41692

changelogs/fragments/gce-sort-fix.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- gce_net - Fix sorting of allowed ports (https://github.com/ansible/ansible/pull/41567)

changelogs/fragments/gem-custom-home.yaml

@@ -1,2 +0,0 @@
-minor_changes:
-  - gem - add ability to specify a custom directory for installing gems (https://github.com/ansible/ansible/pull/38195)

changelogs/fragments/grafana-deprecation-warnings.yaml

@@ -1,4 +0,0 @@
----
-bugfixes:
-- Various grafana_* modules - Port away from the deprecated b64encodestring
-  function to the b64encode function instead. https://github.com/ansible/ansible/pull/38388

changelogs/fragments/group_by_localhost.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- group_by - support implicit localhost (https://github.com/ansible/ansible/pull/41860)

changelogs/fragments/includes.yaml

@@ -1,16 +0,0 @@
----
-minor_changes:
-- import/include - Cache task_vars to speed up IncludedFile.process_include_results (https://github.com/ansible/ansible/pull/39026)
-
-bugfixes:
-- dynamic includes - Don't treat undefined vars for conditional includes as truthy (https://github.com/ansible/ansible/pull/39377)
-- import/include - Ensure role handlers have the proper parent, allowing for correct attribute inheritance (https://github.com/ansible/ansible/pull/39426)
-- include_role/import_role - Use the computed role name for include_role/import_role so to diffentiate between names computed from host vars (https://github.com/ansible/ansible/pull/39516)
-- import_playbook - Pass vars applied to import_playbook into parsing of the playbook as they may be needed to parse the imported plays (https://github.com/ansible/ansible/pull/39521)
-- include_role/import_role - Don't overwrite included role handlers with play handlers on parse (https://github.com/ansible/ansible/pull/39563)
-- dynamic includes - Improved performance by fixing re-parenting on copy (https://github.com/ansible/ansible/pull/38747)
-- dynamic includes - Fix IncludedFile comparison for free strategy (https://github.com/ansible/ansible/pull/37083)
-- dynamic includes - Allow inheriting attributes from static parents (https://github.com/ansible/ansible/pull/38827)
-- include_role/import_role - improved performance and recursion depth (https://github.com/ansible/ansible/pull/36470)
-- include_role/import_role - Fix parameter templating (https://github.com/ansible/ansible/pull/36372)
-- dynamic includes - Use the copied and merged task for calculating task vars (https://github.com/ansible/ansible/pull/39762)

changelogs/fragments/iosxr_config_route_policy_objects_fix.yaml

@@ -1,5 +0,0 @@
----
-bugfixes:
-- Fix iosxr_config module to handle route-policy, community-set, prefix-set,
-  as-path-set and rd-set blocks. All these blocks are part of route-policy
-  language of iosxr.

changelogs/fragments/lineinfile-insertbefore-bof-bugfix.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - lineinfile - fix insertbefore when used with BOF to not insert duplicate lines (https://github.com/ansible/ansible/issues/38219)

changelogs/fragments/missing_raise.yml

@@ -1,2 +0,0 @@
-bugfixes:
-    - added missing 'raise' to exception definition https://github.com/ansible/ansible/pull/41690

changelogs/fragments/mode-preserve.yaml

@@ -1,5 +0,0 @@
----
-bugfixes:
-- Implement mode=preserve for the template module
-- Fix mode=preserve with remote_src=True for the copy module
-- Document mode=preserve for both the copy and template module

changelogs/fragments/no_log_fix_for_connection_exceptions.yaml

@@ -1,9 +0,0 @@
----
-bugfixes:
-- '**Security Fix** - Some connection exceptions would cause no_log specified on
-  a task to be ignored.  If this happened, the task information, including any
-  private information could have been displayed to stdout and (if enabled, not
-  the default) logged to a log file specified in ansible.cfg''s log_path.
-  Additionally, sites which redirected stdout from ansible runs to a log file
-  may have stored that private information onto disk that way as well.
-  (https://github.com/ansible/ansible/pull/41414)'

changelogs/fragments/pause-ctrl-c.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - pause - ensure ctrl+c interrupt works in all cases (https://github.com/ansible/ansible/issues/35372)

changelogs/fragments/postgresql_user-encrypted-fixes.yml

@@ -1,7 +0,0 @@
----
-minor_changes:
-- "`postgresql_user` module changed `encrypted=yes` to be the default. This
-   shouldn't break any current playbooks, the module will just store passwords
-   hashed by default. This change was done because Postgres 10 dropped support for
-   `UNENCRYPTED` passwords and because all versions since Postgres 7.2 support
-   storing encrypted passwords."

changelogs/fragments/powershell_use_set_tmpdir.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- powershell - use the tmpdir set by `remote_tmp` for become/async tasks instead of the generic $env:TEMP - https://github.com/ansible/ansible/pull/40210

changelogs/fragments/py36-spwd.yaml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- spwd - With python 3.6 spwd.getspnam returns PermissionError instead of KeyError if user does not have privileges (https://github.com/ansible/ansible/issues/39472)

changelogs/fragments/reset_con_fix.yml

@@ -1,2 +0,0 @@
-bugfixes:
-    - uses correct conn info for reset_connection  https://github.com/ansible/ansible/issues/27520

changelogs/fragments/selinux-check-mode.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - selinux - correct check mode behavior to report same changes as normal mode (https://github.com/ansible/ansible/pull/40721)

changelogs/fragments/synchronize_remote_is_local.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-- synchronize - Ensure the local connection created by synchronize uses _remote_is_local=True, which causes ActionBase to build a local tmpdir (https://github.com/ansible/ansible/pull/40833)

changelogs/fragments/template-filename-encoding.yaml

@@ -1,5 +0,0 @@
----
-bugfixes:
-- template action plugin - fix the encoding of filenames to avoid tracebacks on
-  Python2 when characters that are not present in the user's locale are
-  present. (https://github.com/ansible/ansible/pull/39424)

changelogs/fragments/user-expires.yaml

@@ -1,2 +0,0 @@
-bugfixes:
-  - user - only change the expiration time when necessary (https://github.com/ansible/ansible/issues/13235)

changelogs/fragments/v2.6.0_summary.yaml

@@ -1,3 +0,0 @@
-release_summary: |
-   | Release Date: 2018-06-28
-   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_

changelogs/fragments/v2.6.0a1_catchup.yaml

@@ -1,7 +0,0 @@
-deprecated_features:
-- nxos_igmp_interface module - The oif_prefix and oif_source properties are deprecated. Use the oif_ps parameter with a dictionary of prefix and source to values instead.
-
-minor_changes:
-- cloudflare_dns module - Removed restriction from protocol to allow other protocols than tcp and udp to be specified.
-- vmware_target_canonical_facts module - The target_id parameter is an optional parameter.
-- postgresql_user module - Changed encrypted=yes to be the default. This shouldn't break any current playbooks, the module will just store passwords hashed by default. This change was done because Postgres 10 dropped support for UNENCRYPTED passwords and because all versions since Postgres 7.2 support storing encrypted passwords.

changelogs/fragments/v2.6.0a1_summary.yaml

@@ -1,3 +0,0 @@
-release_summary: |
-   | Release Date: 2018-05-21
-   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_

changelogs/fragments/v2.6.0a2_catchup.yaml

@@ -1 +0,0 @@
-{}

changelogs/fragments/v2.6.0a2_summary.yaml

@@ -1,3 +0,0 @@
-release_summary: |
-   | Release Date: 2018-05-30
-   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_

changelogs/fragments/v2.6.0rc1_catchup.yaml

@@ -1 +0,0 @@
-{}

changelogs/fragments/v2.6.0rc1_summary.yaml

@@ -1,3 +0,0 @@
-release_summary: |
-   | Release Date: 2018-06-05
-   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_

changelogs/fragments/v2.6.0rc2_summary.yaml

@@ -1,3 +0,0 @@
-release_summary: |
-   | Release Date: 2018-06-08
-   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_

changelogs/fragments/v2.6.0rc3_summary.yaml

@@ -1,3 +0,0 @@
-release_summary: |
-   | Release Date: 2018-06-18
-   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`_