Update Ansible to version 2.1.1.0.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Tue Sep 13 11:23:21 2016 +0200
Changeset:	e33912d2978db717a26a9d8f934e4bfd7c69fe0c

Modified Files:
	ansible/Makefile
	ansible/PLIST
	ansible/distinfo
	ansible/patches/patch-lib_ansible_cli_galaxy.py
	ansible/patches/patch-lib_ansible_constants.py

Log Message:
Update Ansible to version 2.1.1.0.

Mostly minor bugfixes relative to 2.1.0.0:

* If the user is not using paramiko or vault, allow Ansible to run
  if pycrypto is not installed.
* Fixed a bug in pkg_util module that caused "update_catalog must
  be one of" error if 'update_catalog' arg was used.
* Fixed a bug where psuedo-connection vars (eg, ansible_winrm_transport)
  defined in group_vars or host_vars were not getting passed to the
  connection.
* Fixed a bug where temp file permissions on BSDs were not using
  filesystem acls when available.
* Fixed some bugs in variable dependency resolution. These were
  mainly related to includes and roles, to bringe the VariableManager
  code in-line with our documentation.
* Fixed a bug in unarchive, when the destination was a symlinked directory.
* Fixed a bug related to performance when loading a large number of groups.
* Fixed bugs related to the way host and group vars are loaded,
  which (for large sets of inventory variables) can reduce CPU and
  memory usage by 50%.
* Fixed a bug where includes were not being implicitly evaluated
  as static when no loop or variables were being used.
* Fixed several more bugs in relation to the way play execution
  continues or halts when hosts fail, to bringe the behavior more in
  line with 1.9.x.
* Fixed bugs related to the use of the underlying shell executable
  with the script and raw modules.
* Fixed several bugs in relation to the way ssh keys were used with
  various networking modules.
* Fixed a bug related to the way handlers are tracked internally,
  which could cause bugs when roles are reused within the same play
  (allow_duplicates: yes) or when the role dependencies formed a
  "diamond" pattern.
* Fixed a bug related to setfacl on platforms which do not support
  the -R option for recursive changes.
* Several fixes to the way async works to prevent race conditions
  and other bugs
* More fixes to the way failed and unreachable hosts affect future plays
* Fixed a bug in the way the to_json filter encoded some objects
* Fixed a bug in the way roles and dependencies are loaded, and
  how they inherit params from parent roles.
* Fixed a bug in which the number of retries in a do/until loop was off by one
* Fixed a bug in the way the passwd lookup deals with salts
* When using the local connection, internally the remote_user value
  is now forced to be the current user even if remote_user is specified,
  to prevent issues with become settings
* Fix for Azure modules to work with most recent Azure python
  library (2.0.0rc5)
* Fix for bug related to unreachable hosts and any_errors_fatal in
  the linear strategy
* Fix for error handling in relation to killed/dead worker processes.
  If workers are killed via SIGKILL or SIGTERM, this will halt
  execution of the playbook.
* Fixed a regression in the way we handle variables from dependent roles.
* Added better handling for certain errors thrown from the cryptography.
* Fixed a typo in the azure_rm_storageaccount module.
* Fixed some minor bugs in the os_user_role and cs_volume modules.
* Fixed a bug related to the return value of a low-level inventory
  API call related to getting variables for hosts and groups.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e33912d2978db717a26a9d8f934e4bfd7c69fe0c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ansible/Makefile                                |  4 ++--
 ansible/PLIST                                   |  5 +++++
 ansible/distinfo                                | 13 +++++++------
 ansible/patches/patch-lib_ansible_cli_galaxy.py | 16 ++++++++--------
 ansible/patches/patch-lib_ansible_constants.py  | 14 +++++++-------
 5 files changed, 29 insertions(+), 23 deletions(-)

diffs:
diff --git a/ansible/Makefile b/ansible/Makefile
index 05f81a4..ef044f0 100644
--- a/ansible/Makefile
+++ b/ansible/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.9 2016/02/24 22:32:59 tty Exp $
 
-DISTNAME=	ansible-2.1.0.0
-PKGREVISION=	2
+DISTNAME=	ansible-2.1.1.0
 #PKGNAME=	${PYPKGPREFIX}-${DISTNAME} # XXX: for when package is py3x-ready
 CATEGORIES=	python sysutils
 MASTER_SITES=	http://releases.ansible.com/ansible/
@@ -35,6 +34,7 @@ SUBST_FILES.prefix+=	lib/ansible/constants.py lib/ansible/cli/galaxy.py
 SUBST_FILES.prefix+=	lib/ansible/modules/core/system/ping.py
 SUBST_FILES.prefix+=	lib/ansible/modules/core/system/setup.py
 SUBST_FILES.prefix+=	lib/ansible/modules/extras/monitoring/nagios.py
+SUBST_FILES.prefix+=	lib/ansible/utils/module_docs_fragments/openstack.py
 SUBST_FILES.prefix+=	contrib/README.md contrib/inventory/cobbler.py
 SUBST_FILES.prefix+=	contrib/inventory/collins.py contrib/inventory/nova.py
 SUBST_FILES.prefix+=	contrib/inventory/openstack.py
diff --git a/ansible/PLIST b/ansible/PLIST
index 3c1a587..6160b6b 100644
--- a/ansible/PLIST
+++ b/ansible/PLIST
@@ -2285,6 +2285,9 @@ ${PYSITELIB}/ansible/playbook/conditional.pyo
 ${PYSITELIB}/ansible/playbook/handler.py
 ${PYSITELIB}/ansible/playbook/handler.pyc
 ${PYSITELIB}/ansible/playbook/handler.pyo
+${PYSITELIB}/ansible/playbook/handler_task_include.py
+${PYSITELIB}/ansible/playbook/handler_task_include.pyc
+${PYSITELIB}/ansible/playbook/handler_task_include.pyo
 ${PYSITELIB}/ansible/playbook/helpers.py
 ${PYSITELIB}/ansible/playbook/helpers.pyc
 ${PYSITELIB}/ansible/playbook/helpers.pyo
@@ -2842,3 +2845,5 @@ man/man1/ansible-vault.1
 man/man1/ansible.1
 share/examples/ansible/ansible.cfg
 share/examples/ansible/hosts
+@pkgdir share/examples/ansible/playbooks
+@pkgdir etc/ansible
diff --git a/ansible/distinfo b/ansible/distinfo
index 75c987a..72e4633 100644
--- a/ansible/distinfo
+++ b/ansible/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (ansible-2.1.0.0.tar.gz) = 319023b215344c843e26ccfd8716127ed903ad43
-RMD160 (ansible-2.1.0.0.tar.gz) = 3fd1e1d3a9cd90b14c420a5d46852c2007a70adc
-SHA512 (ansible-2.1.0.0.tar.gz) = 8601325098b70469cf908ce09c075334952774519a4331f109b6aa0568fc718bb347ea4d06389277e41ce54270b19dca01815f46071d8e638e0cd751957f20c7
-Size (ansible-2.1.0.0.tar.gz) = 1877209 bytes
+SHA1 (ansible-2.1.1.0.tar.gz) = f596a7950ebe839eaf650643e9afeb8c1307817a
+RMD160 (ansible-2.1.1.0.tar.gz) = 44cd107715611b3d4203b9ec5a30668f1bb9601b
+SHA512 (ansible-2.1.1.0.tar.gz) = c6537736fc3776d885fad04d02d0ec3b95e331d988fe4a696be90a7f4b1fa30ff8cbb34701f80857dbdcc049356d501ff2f613f65d2287b2d7b20c08cd7b1cd5
+Size (ansible-2.1.1.0.tar.gz) = 1844349 bytes
 SHA1 (patch-contrib_README.md) = 2ee41243901233670a2e2967b834e3d14e639699
 SHA1 (patch-contrib_inventory_cobbler.py) = 3d5811a00c18556a8993f23e17df6238bde477b5
 SHA1 (patch-contrib_inventory_collins.py) = fd3c4d71d8373488979274a9abb7faad173cc02f
@@ -22,10 +22,11 @@ SHA1 (patch-docs_man_man1_ansible.1) = 7625324222ce6aacfbe31f6551b87ff74f50c296
 SHA1 (patch-docs_man_man1_ansible.1.asciidoc.in) = 007b2304abf2252df9aaa98fa9e37eb9bfcdf137
 SHA1 (patch-examples_ansible.cfg) = 72de9cbce69150a6718439ed46de0816fc17102c
 SHA1 (patch-examples_hosts) = d6df854be7ea6fa4978681238f722cc9698bd34e
-SHA1 (patch-lib_ansible_cli_galaxy.py) = deabc09994f6e55cd5152dc5da07e852e097b073
-SHA1 (patch-lib_ansible_constants.py) = 2749d773973d7fd93af77f4879c64aad7b2570af
+SHA1 (patch-lib_ansible_cli_galaxy.py) = 9701c4434c5a39c0d3ce244007e7663fb06d97d3
+SHA1 (patch-lib_ansible_constants.py) = f61d603bf0c4880c96c75965970f4f10b53359d2
 SHA1 (patch-lib_ansible_module__utils_junos.py) = bc03c774ba55aec916c6c918adcaae2dd32e13f9
 SHA1 (patch-lib_ansible_modules_core_network_junos_junos__template.py) = e0c74d47aed32e41f450dc141da9eb90a73a7f35
 SHA1 (patch-lib_ansible_modules_core_system_ping.py) = 5fbb798d79e22de60ec736a7e7e96be0fadf4b1f
 SHA1 (patch-lib_ansible_modules_core_system_setup.py) = aece6abe6b7a4464bc86a48b5a289ba04093b193
 SHA1 (patch-lib_ansible_modules_extras_monitoring_nagios.py) = d263a9414d9fdd3c061d7ef2653f0ef648bf359b
+SHA1 (patch-lib_ansible_utils_module__docs__fragments_openstack.py) = 96a1c878c7fc93b6b7d58ec7472ab4a30ff21b39
diff --git a/ansible/patches/patch-lib_ansible_cli_galaxy.py b/ansible/patches/patch-lib_ansible_cli_galaxy.py
index 7edbf93..ea74b05 100644
--- a/ansible/patches/patch-lib_ansible_cli_galaxy.py
+++ b/ansible/patches/patch-lib_ansible_cli_galaxy.py
@@ -4,12 +4,12 @@ Fix hardcoded path.
 
 --- lib/ansible/cli/galaxy.py.orig	2016-05-25 13:00:55.000000000 +0000
 +++ lib/ansible/cli/galaxy.py
-@@ -127,7 +127,7 @@ class GalaxyCLI(CLI):
-                                    type=str, 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)')
-+                     'ansible.cfg file (@PKG_SYSCONFDIR@/ansible/roles if not configured)')
+@@ -115,7 +115,7 @@ class GalaxyCLI(CLI):
+             # NOTE: while the option type=str, the default is a list, and the
+             # callback will set the value to a list.
+             self.parser.add_option('-p', '--roles-path', dest='roles_path', action="callback", callback=CLI.expand_paths, type=str, 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)')
++                help='The path to the directory containing your roles. The default is the roles_path configured in your ansible.cfg file (@PKG_SYSCONFDIR@/ansible/roles if not configured)')
  
-         if self.action in ("import","info","init","install","login","search","setup","delete"):
-             self.parser.add_option('-s', '--server', dest='api_server', default=C.GALAXY_SERVER,
+         if self.action in ("init","install"):
+             self.parser.add_option('-f', '--force', dest='force', action='store_true', default=False, help='Force overwriting an existing role')
diff --git a/ansible/patches/patch-lib_ansible_constants.py b/ansible/patches/patch-lib_ansible_constants.py
index 038ff5a..bc5bb93 100644
--- a/ansible/patches/patch-lib_ansible_constants.py
+++ b/ansible/patches/patch-lib_ansible_constants.py
@@ -4,7 +4,7 @@ Fix hardcoded paths.
 
 --- lib/ansible/constants.py.orig	2016-05-25 13:00:55.000000000 +0000
 +++ lib/ansible/constants.py
-@@ -92,7 +92,7 @@ def _get_config(p, section, key, env_var
+@@ -99,7 +99,7 @@ def _get_config(p, section, key, env_var
      return default
  
  def load_config_file():
@@ -13,7 +13,7 @@ Fix hardcoded paths.
  
      p = configparser.ConfigParser()
  
-@@ -103,7 +103,7 @@ def load_config_file():
+@@ -110,7 +110,7 @@ def load_config_file():
              path0 += "/ansible.cfg"
      path1 = os.getcwd() + "/ansible.cfg"
      path2 = os.path.expanduser("~/.ansible.cfg")
@@ -22,7 +22,7 @@ Fix hardcoded paths.
  
      for path in [path0, path1, path2, path3]:
          if path is not None and os.path.exists(path):
-@@ -132,7 +132,7 @@ DEFAULTS='defaults'
+@@ -139,7 +139,7 @@ DEFAULTS='defaults'
  # FIXME: add deprecation warning when these get set
  #### DEPRECATED VARS #### 
  # use more sanely named 'inventory'
@@ -31,16 +31,16 @@ Fix hardcoded paths.
  # this is not used since 0.5 but people might still have in config
  DEFAULT_PATTERN           = get_config(p, DEFAULTS, 'pattern', None, None)
  
-@@ -140,7 +140,7 @@ DEFAULT_PATTERN           = get_config(p
+@@ -147,7 +147,7 @@ DEFAULT_PATTERN           = get_config(p
  DEFAULT_DEBUG             = get_config(p, DEFAULTS, 'debug',            'ANSIBLE_DEBUG',            False, boolean=True)
  DEFAULT_HOST_LIST         = get_config(p, DEFAULTS,'inventory', 'ANSIBLE_INVENTORY', DEPRECATED_HOST_LIST, ispath=True)
  DEFAULT_MODULE_PATH       = get_config(p, DEFAULTS, 'library',          'ANSIBLE_LIBRARY',          None, ispathlist=True)
--DEFAULT_ROLES_PATH        = get_config(p, DEFAULTS, 'roles_path',       'ANSIBLE_ROLES_PATH',       '/etc/ansible/roles', ispathlist=True)
-+DEFAULT_ROLES_PATH        = get_config(p, DEFAULTS, 'roles_path',       'ANSIBLE_ROLES_PATH',       '@PKG_SYSCONFDIR@/ansible/roles', ispathlist=True)
+-DEFAULT_ROLES_PATH        = get_config(p, DEFAULTS, 'roles_path',       'ANSIBLE_ROLES_PATH',       '/etc/ansible/roles', ispathlist=True, expand_relative_paths=True)
++DEFAULT_ROLES_PATH        = get_config(p, DEFAULTS, 'roles_path',       'ANSIBLE_ROLES_PATH',       '@PKG_SYSCONFDIR@/ansible/roles', ispathlist=True, expand_relative_paths=True)
  DEFAULT_REMOTE_TMP        = get_config(p, DEFAULTS, 'remote_tmp',       'ANSIBLE_REMOTE_TEMP',      '$HOME/.ansible/tmp')
  DEFAULT_LOCAL_TMP         = get_config(p, DEFAULTS, 'local_tmp',        'ANSIBLE_LOCAL_TEMP',      '$HOME/.ansible/tmp', istmppath=True)
  DEFAULT_MODULE_NAME       = get_config(p, DEFAULTS, 'module_name',      None,                       'command')
-@@ -222,16 +222,16 @@ DEFAULT_BECOME_ASK_PASS   = get_config(p
+@@ -229,16 +229,16 @@ DEFAULT_BECOME_ASK_PASS   = get_config(p
  # (mapping of param: squash field)
  DEFAULT_SQUASH_ACTIONS         = get_config(p, DEFAULTS, 'squash_actions',     'ANSIBLE_SQUASH_ACTIONS', "apk, apt, dnf, package, pacman, pkgng, yum, zypper", islist=True)
  # paths