kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update ansible to version 2.3.1.0.

Browse source 
Pkgsrc changes:
 * Adapt patches and PLIST.
 * Rename package to use PYPREFIX, it's now beleived to support python 3.
 * Add the python 3 versions to PYTHON_VERSIONS_ACCEPTED.

Upstream changes (partial, see CHANGELOG.md for the full list):

* Security fix for CVE-2017-7481 - data for lookup plugins used as
  variables was not being correctly marked as "unsafe".
* Fix default value of fetch module's validate_checksum to be True
* Added fix for "meta: refresh_connection" not working with default
  'smart' connection.
* Fix template so that the --diff command line option works when the
  destination is a directory
* Fix python3 bugs in pam_limits
* Fix unbound error when using module deprecation as a single string
* Several places in which error handling was broken due to bad
  conversions or just typos
* Fix to user module for appending/setting groups on OpenBSD (flags
  were reversed)
* assemble fix to use safer os.join.path, avoids charset issues

* Documented and renamed the previously released 'single var vaulting'
  feature, allowing user to use vault encryption for single variables in
  a normal YAML vars file.
* Allow module_utils for custom modules to be placed in site-specific
  directories and shipped in roles
* On platforms that support it, use more modern system polling API
  instead of select in the ssh connection plugin.
  This removes one limitation on how many parallel forks are feasible
  on these systems.
* Windows/WinRM supports (experimental) become method "runas" to run
  modules and scripts as a different user, and to transparently access
  network resources.
* The WinRM connection plugin now uses pipelining when executing
  modules, resulting in significantly faster execution for small
  tasks.
* The WinRM connection plugin can now manage Kerberos tickets
  automatically when `ansible_winrm_transport=kerberos` and
  `ansible_user`/`ansible_password` are specified.
* Refactored/standardized most Windows modules, adding check-mode and
  diff support where possible.
* Extended Windows module API with parameter-type support, helper
  functions. (i.e. Expand-Environment, Add-Warning,
  Add-DeprecatationWarning)
* restructured how async works to allow it to apply to action plugins
  that choose to support it.

* The version and release facts for OpenBSD hosts were reversed.
  This has been changed so that version has the numeric portion and
  release has the name of the release.
* removed 'package' from default squash actions as not all package
  managers support it and it creates errors when using loops, any user
  can add back via config options if they don't use those package
  managers or otherwise avoid the errors.
* Blocks can now have a `name` field, to aid in playbook readability.
* default strategy is now configurable via ansible.cfg or environment
  variable.
* Added 'ansible_playbook_python' which contains 'current python
  executable', it can be blank in some cases in which Ansible is not
  invoked via the standard CLI (sys.executable limitation).
* Added 'metadata' to modules to enable classification
* ansible-doc now displays path to module and existing 'metadata'
* added optional 'piped' transfer method to ssh plugin for when scp
  and sftp are missing, ssh plugin is also now 'smarter' when using
  these options
* default controlpersist path is now a custom hash of host-port-user
  to avoid the socket path length errors for long hostnames
* Various fixes for Python3 compatibility
* Fixed issues with inventory formats not handling 'all' and
  'ungrouped' in an uniform way.
* 'service' tasks can now use async again, we had lost this capability
  when changed into an action plugin.
* made any_errors_fatal inheritable from play to task and all other
  objects in between.
* many small performance improvements in inventory and variable
  handling and in task execution.

* Specifying --tags (or --skip-tags) multiple times on the command line

  currently leads to the last one overriding all the previous
  ones. This behaviour is deprecated.
  In the future, if you specify --tags multiple times the tags will be
  merged to gether.  From now on, using --tags multiple times on one
  command line will emit a deprecation warning.  Setting the
  merge_multiple_cli_tags option to True in the ansible.cfg file will
  enable the new behaviour.
  In 2.4, the default will be to merge and you can enable the old
  overwriting behaviour via the config option.
  In 2.5, multiple --tags options will be merged with no way to go
  back to the old behaviour.

Lots of new modules, see CHANGELOG.md in the source for details.

* Security fix for CVE-2016-9587 - An attacker with control over a
  client system being managed by Ansible and the ability to send facts
  back to the Ansible server could use this flaw to execute arbitrary
  code on the Ansible server as the user and group Ansible is running
  as.

* Fixes a bug where undefined variables in with_* loops would cause a
  task failure even if the when condition would cause the task to be
  skipped.
* Fixed a bug related to roles where in certain situations a role may
  be run more than once despite not allowing duplicates.
* Fixed some additional bugs related to atomic_move for modules.
* Fixes multiple bugs related to field/attribute inheritance in nested
  blocks and includes, as well as task iteration logic during
  failures.
* Fixed pip installing packages into virtualenvs using the system pip
  instead of the virtualenv pip.
* Fixed dnf on systems with dnf-2.0.x (some changes in the API).
* Fixed traceback with dnf install of groups.
* Fixes a bug in which include_vars was not working with failed_when.
* Fix for include_vars only loading files with .yml, .yaml, and .json
  extensions.  This was only supposed to apply to loading a directory
  of vars files.
* Fixes several bugs related to properly incrementing the failed count
  in the host statistics.
* Fixes a bug with listening handlers which did not specify a `name`
  field.
* Fixes a bug with the `play_hosts` internal variable, so that it
  properly reflects the current list of hosts.
* Fixes a bug related to the v2_playbook_on_start callback method and
  legacy (v1) plugins.
* Fixes an openssh related process exit race condition, related to the
  fact that connections using ControlPersist do not close stderr.
* Improvements and fixes to OpenBSD fact gathering.
* Updated `make deb` to use pbuilder. Use `make local_deb` for the
  previous non-pbuilder build.
* Fixed Windows async to avoid blocking due to handle inheritance.
* Fixed bugs in the mount module on older Linux kernels and *BSDs
* Various minor fixes for Python 3
* Inserted some checks for jinja2-2.9, which can cause some issues
  with Ansible currently.
This commit is contained in:
Havard Eidnes 2017-06-14 16:41:54 +02:00
parent b3d07b6dd4
commit ad46dc2560
19 changed files with 3880 additions and 2858 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
ansible/Makefile
View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.9 2016/02/24 22:32:59 tty Exp $
DISTNAME= ansible-2.2.0.0
#PKGNAME= ${PYPKGPREFIX}-${DISTNAME} # XXX: for when package is py3x-ready
PKGREVISION= 1
DISTNAME= ansible-2.3.1.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= python sysutils
MASTER_SITES= http://releases.ansible.com/ansible/
@ -18,35 +17,43 @@ DEPENDS+= ${PYPKGPREFIX}-crypto>=2.6:../../security/py-crypto
DEPENDS+= ${PYPKGPREFIX}-jxmlease-[0-9]*:../../wip/py-jxmlease
USE_TOOLS+= gmake
PYTHON_VERSIONS_ACCEPTED= 27
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-paramiko
PYTHON_VERSIONS_ACCEPTED= 36 35 34 27
EGDIR= ${PREFIX}/share/examples/ansible
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= pre-configure
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= pre-configure
SUBST_FILES.prefix+= contrib/README.md
SUBST_FILES.prefix+= contrib/inventory/cobbler.py
SUBST_FILES.prefix+= contrib/inventory/collins.py
SUBST_FILES.prefix+= contrib/inventory/nova.py
SUBST_FILES.prefix+= contrib/inventory/openstack.py
SUBST_FILES.prefix+= contrib/inventory/spacewalk.py
SUBST_FILES.prefix+= docs/man/man1/ansible.1
SUBST_FILES.prefix+= docs/man/man1/ansible.1.asciidoc.in
SUBST_FILES.prefix+= docs/man/man1/ansible-doc.1
SUBST_FILES.prefix+= docs/man/man1/ansible-doc.1.asciidoc.in
SUBST_FILES.prefix+= docs/man/man1/ansible-galaxy.1
SUBST_FILES.prefix+= docs/man/man1/ansible-galaxy.1.asciidoc.in
SUBST_FILES.prefix+= docs/man/man1/ansible-playbook.1
SUBST_FILES.prefix+= docs/man/man1/ansible-playbook.1.asciidoc.in
SUBST_FILES.prefix+= examples/ansible.cfg examples/hosts
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+= docs/man/man1/ansible-pull.1
SUBST_FILES.prefix+= docs/man/man1/ansible-pull.1.asciidoc.in
SUBST_FILES.prefix+= examples/ansible.cfg
SUBST_FILES.prefix+= examples/hosts
SUBST_FILES.prefix+= lib/ansible/constants.py
SUBST_FILES.prefix+= lib/ansible/cli/galaxy.py
SUBST_FILES.prefix+= lib/ansible/modules/monitoring/nagios.py
SUBST_FILES.prefix+= lib/ansible/modules/system/ping.py
SUBST_FILES.prefix+= lib/ansible/modules/system/setup.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
SUBST_FILES.prefix+= contrib/inventory/spacewalk.py
SUBST_MESSAGE.prefix= Fixing PREFIX path.
SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX},"
SUBST_SED.prefix+= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},"
SUBST_SED.prefix+= -e "s,@PYSITELIB@,${PYSITELIB},"
SUBST_MESSAGE.prefix= Fixing PREFIX, PYSITELIB, and PKG_SYSCONFDIR path.
SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX},"
SUBST_SED.prefix+= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g"
SUBST_SED.prefix+= -e "s,@PYSITELIB@,${PYSITELIB},"
PY_DIRS= lib/ansible contrib/inventory
PY_DIRS= lib/ansible
PY_DIRS+= contrib/inventory
.for f in `find ${PY_DIRS} -name \*.py`
REPLACE_PYTHON+= ${f}
@ -55,7 +62,9 @@ REPLACE_PYTHON+= ${f}
MANPAGES= ansible-doc.1 ansible-pull.1 ansible-galaxy.1 ansible-vault.1
MANPAGES+= ansible-playbook.1 ansible.1
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKG_SYSCONFDIR}/ansible
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/ansible
INSTALLATION_DIRS+= ${EGDIR}/playbooks
CHECK_INTERPRETER_SKIP= share/ansible/*

6370
ansible/PLIST
View file

File diff suppressed because it is too large Load diff

37
ansible/distinfo
View file

@ -1,10 +1,10 @@
$NetBSD$
SHA1 (ansible-2.2.0.0.tar.gz) = dd150530be9f75f7b9f716b2044b438494c6605a
RMD160 (ansible-2.2.0.0.tar.gz) = 87ce9be058eab86a68b239ade29b6e4183a20f90
SHA512 (ansible-2.2.0.0.tar.gz) = 8bb8360f41e920c46552ead826a342311d0acffa264334c8c8ae868f8bf45caad4ff2b9c9c0ec4e551653edaf80eb49d8dece5c2ba7e1088c2ce74d3ff0e3130
Size (ansible-2.2.0.0.tar.gz) = 2441851 bytes
SHA1 (patch-contrib_README.md) = 2ee41243901233670a2e2967b834e3d14e639699
SHA1 (ansible-2.3.1.0.tar.gz) = 7c5aa4e8908a0110904f3886000172cbb81c98a4
RMD160 (ansible-2.3.1.0.tar.gz) = 7bb08ad54ff6d418843853853a561cfd116085bc
SHA512 (ansible-2.3.1.0.tar.gz) = 7b4b33c56a15c41d756f095944d7a0dbf894557350879430df21061b717b9574aae624a276bf7e1a13d043b718aeaccac1ce510a3cb085983311ddf06fa832bc
Size (ansible-2.3.1.0.tar.gz) = 4263357 bytes
SHA1 (patch-contrib_README.md) = 0493d61ab37e2c225a7c0c8481bedb15aa0b482c
SHA1 (patch-contrib_inventory_cobbler.py) = 3d5811a00c18556a8993f23e17df6238bde477b5
SHA1 (patch-contrib_inventory_collins.py) = fd3c4d71d8373488979274a9abb7faad173cc02f
SHA1 (patch-contrib_inventory_nova.py) = d72d5da4a152c7165acab66512a5152d53c1edda
@ -12,19 +12,20 @@ SHA1 (patch-contrib_inventory_openstack.py) = c355bb380817eaba2cea175b06dadfb325
SHA1 (patch-contrib_inventory_spacewalk.py) = fe4a439f23b3ccb356803ff93d2e7c45b979257d
SHA1 (patch-docs_man_man1_ansible-doc.1) = f6c2523eb889ab8b623a7f565b3314a9f877cef3
SHA1 (patch-docs_man_man1_ansible-doc.1.asciidoc.in) = 4c4602ce499d97c37f4e2e821e40414ce8073add
SHA1 (patch-docs_man_man1_ansible-galaxy.1) = f2eeb4a1bd1cc2ec5f2329c872a8421d66b4c606
SHA1 (patch-docs_man_man1_ansible-galaxy.1.asciidoc.in) = 56c652a14b2b55356c431fc8b72780835e14445c
SHA1 (patch-docs_man_man1_ansible-playbook.1) = a99c088dee56e6d90473d33cf991b2a05ac243d3
SHA1 (patch-docs_man_man1_ansible-playbook.1.asciidoc.in) = 30c4b845c94bc8055e1f90f2451ba93a4526b89f
SHA1 (patch-docs_man_man1_ansible-pull.1) = 1edb0cd6fd6638086982662927e632b979e28235
SHA1 (patch-docs_man_man1_ansible-pull.1.asciidoc.in) = 320c3610c01d420707e75b0d93058ea2b9047b65
SHA1 (patch-docs_man_man1_ansible-galaxy.1) = f719103f8c79c5f9daceccdcf79c0adb26c0bf61
SHA1 (patch-docs_man_man1_ansible-galaxy.1.asciidoc.in) = 75cad33e8a647d13f2c9fe358aad16e92058ccde
SHA1 (patch-docs_man_man1_ansible-playbook.1) = 9f759bf0c3e65e52f06a550d0be679c609ce692c
SHA1 (patch-docs_man_man1_ansible-playbook.1.asciidoc.in) = 794dc0c8498a1679796dee4912d197d7733a8c11
SHA1 (patch-docs_man_man1_ansible-pull.1) = de7c6b06760daaac28a9c00496e7d3568814df07
SHA1 (patch-docs_man_man1_ansible-pull.1.asciidoc.in) = 397adbabfaec2597e9c342361de72bbdb271e94d
SHA1 (patch-docs_man_man1_ansible.1) = 661b9d23a21112aa396aa1b727a4757b2123d92a
SHA1 (patch-docs_man_man1_ansible.1.asciidoc.in) = 90a13993b778b6449de26aea3a4f22f0dd6ddf39
SHA1 (patch-examples_ansible.cfg) = 35bc550e1d4e498d4d4f588ce2fe6bd8af8ad5bc
SHA1 (patch-examples_ansible.cfg) = 484bc857a3f3f07e9947af8f3d305812a42eafbe
SHA1 (patch-examples_hosts) = d6df854be7ea6fa4978681238f722cc9698bd34e
SHA1 (patch-lib_ansible_cli_galaxy.py) = 9701c4434c5a39c0d3ce244007e7663fb06d97d3
SHA1 (patch-lib_ansible_constants.py) = 2ba1813f47e89dc79c4c8ee5698292aa9017c9da
SHA1 (patch-lib_ansible_modules_core_network_junos_junos__config.py) = c0c4c7710f81464deb687096cbdd1f262288b2ce
SHA1 (patch-lib_ansible_modules_core_system_ping.py) = 5fbb798d79e22de60ec736a7e7e96be0fadf4b1f
SHA1 (patch-lib_ansible_modules_core_system_setup.py) = 44c35e7ba94cb96b1fc4a0501470d2d4d9747150
SHA1 (patch-lib_ansible_modules_extras_monitoring_nagios.py) = d263a9414d9fdd3c061d7ef2653f0ef648bf359b
SHA1 (patch-lib_ansible_cli_galaxy.py) = 7789f0e54974b60138b1aea483e2d92b88da578e
SHA1 (patch-lib_ansible_constants.py) = b61b5c29a58c974d65475ee2b68ffcd6f7a0b5ca
SHA1 (patch-lib_ansible_module__utils_junos.py) = 937d3ec815ff430fd4455295c27439a7904f3f51
SHA1 (patch-lib_ansible_modules_monitoring_nagios.py) = afca9866a33e682d7918ccf39f79417a149bd675
SHA1 (patch-lib_ansible_modules_system_ping.py) = c51e6614eccb69d3db744d2dbc0866d2ac75f77c
SHA1 (patch-lib_ansible_modules_system_setup.py) = 52b333d68b088138897044011b74b41dff576310
SHA1 (patch-lib_ansible_utils_module__docs__fragments_openstack.py) = 7080591b848cc4f21fa2706a84d0d75390dfbe3e

6
ansible/patches/patch-contrib_README.md
View file

@ -8,8 +8,8 @@ Fix hardcoded path.
you like. Examples include discovering inventory from EC2 or pulling it from
Cobbler. These could also be used to interface with LDAP or database.
-chmod +x an inventory plugin and either name it /etc/ansible/hosts or use ansible
+chmod +x an inventory plugin and either name it @PKG_SYSCONFDIR@/ansible/hosts or use ansible
with -i to designate the path to the script. You might also need to copy a configuration
-`chmod +x` an inventory plugin and either name it `/etc/ansible/hosts` or use `ansible -i /path/to/inventory/script`. You might also need to copy a configuration
+`chmod +x` an inventory plugin and either name it `@PKG_SYSCONFDIR@/ansible/hosts` or use `ansible -i /path/to/inventory/script`. You might also need to copy a configuration
file with the same name and/or set environment variables, the scripts or configuration
files have more details.

6
ansible/patches/patch-docs_man_man1_ansible-galaxy.1
View file

@ -2,7 +2,7 @@ $NetBSD: patch-docs_man_man1_ansible-galaxy.1,v 1.0 2016/02/24 22:43:35 tty Exp
Fix hardcoded paths.
--- docs/man/man1/ansible-galaxy.1.orig 2016-01-14 22:33:40.000000000 +0000
--- docs/man/man1/ansible-galaxy.1.orig 2017-06-01 17:00:26.000000000 +0000
+++ docs/man/man1/ansible-galaxy.1
@@ -109,7 +109,7 @@ The path to the directory containing you
\fBroles_path\fR
@ -22,7 +22,7 @@ Fix hardcoded paths.
.RE
.SH "INIT"
.sp
@@ -168,7 +168,7 @@ The path to the directory containing you
@@ -179,7 +179,7 @@ The path to the directory containing you
\fBroles_path\fR
configured in your
\fBansible\&.cfg\fR
@ -31,7 +31,7 @@ Fix hardcoded paths.
.RE
.SH "SEARCH"
.sp
@@ -217,7 +217,7 @@ The path to the directory containing you
@@ -228,7 +228,7 @@ The path to the directory containing you
\fBroles_path\fR
configured in your
\fBansible\&.cfg\fR

6
ansible/patches/patch-docs_man_man1_ansible-galaxy.1.asciidoc.in
View file

@ -2,7 +2,7 @@ $NetBSD: patch-docs_man_man1_ansible-galaxy.1.asciidoc.in,v 1.0 2016/02/24 22:43
Fix hardcoded paths.
--- docs/man/man1/ansible-galaxy.1.asciidoc.in.orig 2016-01-14 22:33:27.000000000 +0000
--- docs/man/man1/ansible-galaxy.1.asciidoc.in.orig 2017-06-01 17:00:04.000000000 +0000
+++ docs/man/man1/ansible-galaxy.1.asciidoc.in
@@ -72,7 +72,7 @@ Don't download roles listed as dependenc
*-p* 'ROLES_PATH', *--roles-path=*'ROLES_PATH'::
@ -22,7 +22,7 @@ Fix hardcoded paths.
INIT
----
@@ -141,7 +141,7 @@ OPTIONS
@@ -154,7 +154,7 @@ OPTIONS
*-p* 'ROLES_PATH', *--roles-path=*'ROLES_PATH'::
The path to the directory containing your roles. The default is the *roles_path*
@ -31,7 +31,7 @@ Fix hardcoded paths.
SEARCH
@@ -198,7 +198,7 @@ OPTIONS
@@ -211,7 +211,7 @@ OPTIONS
*-p* 'ROLES_PATH', *--roles-path=*'ROLES_PATH'::
The path to the directory containing your roles. The default is the *roles_path*

8
ansible/patches/patch-docs_man_man1_ansible-playbook.1
View file

@ -2,9 +2,9 @@ $NetBSD: patch-docs_man_man1_ansible-playbook.1,v 1.1 2016/03/01 12:01:04 tty Ex
Fix hardcoded paths.
--- docs/man/man1/ansible-playbook.1.orig 2016-02-25 03:01:04.000000000 +0000
--- docs/man/man1/ansible-playbook.1.orig 2017-06-01 17:00:22.000000000 +0000
+++ docs/man/man1/ansible-playbook.1
@@ -123,7 +123,7 @@ Show help page and exit
@@ -128,7 +128,7 @@ Show help page and exit\&.
The
\fIPATH\fR
to the inventory, which defaults to
@ -13,7 +13,7 @@ Fix hardcoded paths.
\fIhost,\fR\&.
.RE
.PP
@@ -154,7 +154,7 @@ List all tasks that would be executed; d
@@ -159,7 +159,7 @@ List all tasks that would be executed; d
The
\fIDIRECTORY\fR
search path to load modules from\&. The default is
@ -22,7 +22,7 @@ Fix hardcoded paths.
.RE
.PP
\fB\-\-private\-key=\fR\fIPRIVATE_KEY_FILE\fR
@@ -274,11 +274,11 @@ ANSIBLE_CONFIG \(em Override the default
@@ -291,11 +291,11 @@ ANSIBLE_CONFIG \(em Override the default
Many more are available for most options in ansible\&.cfg
.SH "FILES"
.sp

8
ansible/patches/patch-docs_man_man1_ansible-playbook.1.asciidoc.in
View file

@ -2,9 +2,9 @@ $NetBSD: patch-docs_man_man1_ansible-playbook.1.asciidoc.in,v 1.1 2016/03/01 12:
Fix hardcoded paths.
--- docs/man/man1/ansible-playbook.1.asciidoc.in.orig 2016-02-25 03:00:56.000000000 +0000
--- docs/man/man1/ansible-playbook.1.asciidoc.in.orig 2017-06-01 17:00:04.000000000 +0000
+++ docs/man/man1/ansible-playbook.1.asciidoc.in
@@ -95,7 +95,7 @@ Show help page and exit
@@ -100,7 +100,7 @@ Show help page and exit.
*-i* 'PATH', *--inventory=*'PATH'::
@ -13,7 +13,7 @@ Fix hardcoded paths.
Alternatively, you can use a comma-separated list of hosts or a single host with a trailing comma 'host,'.
*-l* 'SUBSET', *--limit=*'SUBSET'::
@@ -118,7 +118,7 @@ List all tasks that would be executed; d
@@ -123,7 +123,7 @@ List all tasks that would be executed; d
*-M* 'DIRECTORY', *--module-path=*'DIRECTORY'::
The 'DIRECTORY' search path to load modules from. The default is
@ -22,7 +22,7 @@ Fix hardcoded paths.
environment variable.
*--private-key=*'PRIVATE_KEY_FILE'::
@@ -222,11 +222,11 @@ Many more are available for most options
@@ -241,11 +241,11 @@ Many more are available for most options
FILES
-----

6
ansible/patches/patch-docs_man_man1_ansible-pull.1
View file

@ -2,9 +2,9 @@ $NetBSD: patch-docs_man_man1_ansible-pull.1,v 1.0 2016/02/24 22:43:58 tty Exp $
Fix hardcoded paths.
--- docs/man/man1/ansible-pull.1.orig 2016-01-14 22:33:37.000000000 +0000
--- docs/man/man1/ansible-pull.1.orig 2017-06-01 17:00:23.000000000 +0000
+++ docs/man/man1/ansible-pull.1
@@ -115,7 +115,7 @@ Show the help message and exit\&.
@@ -120,7 +120,7 @@ Show the help message and exit\&.
The
\fIPATH\fR
to the inventory, which defaults to
@ -13,7 +13,7 @@ Fix hardcoded paths.
\fIhost,\fR\&.
.RE
.PP
@@ -201,11 +201,11 @@ ANSIBLE_CONFIG \(em Override the default
@@ -216,11 +216,11 @@ ANSIBLE_CONFIG \(em Override the default
Many more are available for most options in ansible\&.cfg
.SH "FILES"
.sp

6
ansible/patches/patch-docs_man_man1_ansible-pull.1.asciidoc.in
View file

@ -2,9 +2,9 @@ $NetBSD: patch-docs_man_man1_ansible-pull.1.asciidoc.in,v 1.0 2016/02/24 22:44:0
Fix hardcoded paths.
--- docs/man/man1/ansible-pull.1.asciidoc.in.orig 2016-01-14 22:33:27.000000000 +0000
--- docs/man/man1/ansible-pull.1.asciidoc.in.orig 2017-06-01 17:00:04.000000000 +0000
+++ docs/man/man1/ansible-pull.1.asciidoc.in
@@ -105,7 +105,7 @@ Show the help message and exit.
@@ -110,7 +110,7 @@ Show the help message and exit.
*-i* 'PATH', *--inventory=*'PATH'::
@ -13,7 +13,7 @@ Fix hardcoded paths.
Alternatively you can use a comma separated list of hosts or single host with traling comma 'host,'.
*--private-key=*'PRIVATE_KEY_FILE'::
@@ -192,11 +192,11 @@ Many more are available for most options
@@ -205,11 +205,11 @@ Many more are available for most options
FILES
-----

16
ansible/patches/patch-examples_ansible.cfg
View file

@ -2,9 +2,9 @@ $NetBSD: patch-examples_ansible.cfg,v 1.0 2016/02/24 22:44:20 tty Exp $
Fix hardcoded paths.
--- examples/ansible.cfg.orig 2016-05-25 13:00:55.000000000 +0000
--- examples/ansible.cfg.orig 2017-06-01 17:00:04.000000000 +0000
+++ examples/ansible.cfg
@@ -4,15 +4,15 @@
@@ -4,16 +4,16 @@
# nearly all parameters can be overridden in ansible-playbook
# or with command line flags. ansible will read ANSIBLE_CONFIG,
# ansible.cfg in the current working directory, .ansible.cfg in
@ -18,12 +18,14 @@ Fix hardcoded paths.
-#inventory = /etc/ansible/hosts
-#library = /usr/share/my_modules/
-#module_utils = /usr/share/my_module_utils/
+#inventory = @PKG_SYSCONFDIR@/ansible/hosts
+#library = @PREFIX@/share/my_modules/
#remote_tmp = $HOME/.ansible/tmp
#local_tmp = $HOME/.ansible/tmp
+#module_utils = @PREFIX@/share/my_module_utils/
#remote_tmp = ~/.ansible/tmp
#local_tmp = ~/.ansible/tmp
#forks = 5
@@ -53,7 +53,7 @@
@@ -55,7 +55,7 @@
# gather_timeout = 10
# additional paths to search for roles in, colon separated
@ -32,7 +34,7 @@ Fix hardcoded paths.
# uncomment this to disable SSH key host checking
#host_key_checking = False
@@ -84,14 +84,14 @@
@@ -86,14 +86,14 @@
#timeout = 10
# default user to use for playbooks if user is not specified
@ -49,7 +51,7 @@ Fix hardcoded paths.
#module_name = command
# use this shell for commands executed under sudo
@@ -303,7 +303,7 @@
@@ -351,7 +351,7 @@
# Enabling pipelining reduces the number of SSH operations required to
# execute a module on the remote server. This can result in a significant
# performance improvement when enabled, however when using "sudo:" you must

4
ansible/patches/patch-lib_ansible_cli_galaxy.py
View file

@ -2,9 +2,9 @@ $NetBSD: patch-lib_ansible_cli_galaxy.py,v 1.0 2016/02/24 22:44:30 tty Exp $
Fix hardcoded path.
--- lib/ansible/cli/galaxy.py.orig 2016-05-25 13:00:55.000000000 +0000
--- lib/ansible/cli/galaxy.py.orig 2017-06-01 17:00:04.000000000 +0000
+++ lib/ansible/cli/galaxy.py
@@ -115,7 +115,7 @@ class GalaxyCLI(CLI):
@@ -120,7 +120,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,

86
ansible/patches/patch-lib_ansible_constants.py
View file

@ -2,10 +2,10 @@ $NetBSD: patch-lib_ansible_constants.py,v 1.0 2016/02/24 22:44:36 tty Exp $
Fix hardcoded paths.
--- lib/ansible/constants.py.orig 2016-05-25 13:00:55.000000000 +0000
--- lib/ansible/constants.py.orig 2017-06-01 17:00:04.000000000 +0000
+++ lib/ansible/constants.py
@@ -105,7 +105,7 @@ def _get_config(p, section, key, env_var
return default
@@ -140,7 +140,7 @@ def _get_config(p, section, key, env_var
def load_config_file():
- ''' Load Config File order(first found is used): ENV, CWD, HOME, /etc/ansible '''
@ -13,7 +13,7 @@ Fix hardcoded paths.
p = configparser.ConfigParser()
@@ -119,7 +119,7 @@ def load_config_file():
@@ -154,7 +154,7 @@ def load_config_file():
except OSError:
path1 = None
path2 = os.path.expanduser("~/.ansible.cfg")
@ -22,48 +22,50 @@ Fix hardcoded paths.
for path in [path0, path1, path2, path3]:
if path is not None and os.path.exists(path):
@@ -148,7 +148,7 @@ DEFAULTS='defaults'
@@ -184,7 +184,7 @@ DEFAULTS='defaults'
# FIXME: add deprecation warning when these get set
#### DEPRECATED VARS ####
# use more sanely named 'inventory'
-DEPRECATED_HOST_LIST = get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '/etc/ansible/hosts', ispath=True)
+DEPRECATED_HOST_LIST = get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '@PKG_SYSCONFDIR@/ansible/hosts', ispath=True)
-DEPRECATED_HOST_LIST = get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '/etc/ansible/hosts', value_type='path')
+DEPRECATED_HOST_LIST = get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '@PKG_SYSCONFDIR@/ansible/hosts', value_type='path')
# this is not used since 0.5 but people might still have in config
DEFAULT_PATTERN = get_config(p, DEFAULTS, 'pattern', None, None)
@@ -156,7 +156,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, 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)
# If --tags or --skip-tags is given multiple times on the CLI and this is
@@ -197,7 +197,7 @@ MERGE_MULTIPLE_CLI_TAGS = get_config(p,
DEFAULT_DEBUG = get_config(p, DEFAULTS, 'debug', 'ANSIBLE_DEBUG', False, value_type='boolean')
DEFAULT_VERBOSITY = get_config(p, DEFAULTS, 'verbosity', 'ANSIBLE_VERBOSITY', 0, value_type='integer')
DEFAULT_HOST_LIST = get_config(p, DEFAULTS,'inventory', 'ANSIBLE_INVENTORY', DEPRECATED_HOST_LIST, value_type='path')
-DEFAULT_ROLES_PATH = get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', '/etc/ansible/roles', value_type='pathlist', expand_relative_paths=True)
+DEFAULT_ROLES_PATH = get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', '@PKG_SYSCONFDIR@/ansible/roles', value_type='pathlist', expand_relative_paths=True)
DEFAULT_REMOTE_TMP = get_config(p, DEFAULTS, 'remote_tmp', 'ANSIBLE_REMOTE_TEMP', '~/.ansible/tmp')
DEFAULT_LOCAL_TMP = get_config(p, DEFAULTS, 'local_tmp', 'ANSIBLE_LOCAL_TEMP', '~/.ansible/tmp', value_type='tmppath')
DEFAULT_MODULE_NAME = get_config(p, DEFAULTS, 'module_name', None, 'command')
@@ -241,16 +241,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, homebrew, package, pacman, pkgng, yum, zypper", islist=True)
@@ -287,18 +287,18 @@ DEFAULT_BECOME_ASK_PASS = get_config(p
DEFAULT_SQUASH_ACTIONS = get_config(p, DEFAULTS, 'squash_actions', 'ANSIBLE_SQUASH_ACTIONS', "apk, apt, dnf, homebrew, openbsd_pkg, pacman, pkgng, yum, zypper", value_type='list')
# paths
-DEFAULT_ACTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '~/.ansible/plugins/action:/usr/share/ansible/plugins/action', ispathlist=True)
-DEFAULT_CACHE_PLUGIN_PATH = get_config(p, DEFAULTS, 'cache_plugins', 'ANSIBLE_CACHE_PLUGINS', '~/.ansible/plugins/cache:/usr/share/ansible/plugins/cache', ispathlist=True)
-DEFAULT_CALLBACK_PLUGIN_PATH = get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '~/.ansible/plugins/callback:/usr/share/ansible/plugins/callback', ispathlist=True)
-DEFAULT_CONNECTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '~/.ansible/plugins/connection:/usr/share/ansible/plugins/connection', ispathlist=True)
-DEFAULT_LOOKUP_PLUGIN_PATH = get_config(p, DEFAULTS, 'lookup_plugins', 'ANSIBLE_LOOKUP_PLUGINS', '~/.ansible/plugins/lookup:/usr/share/ansible/plugins/lookup', ispathlist=True)
-DEFAULT_INVENTORY_PLUGIN_PATH = get_config(p, DEFAULTS, 'inventory_plugins', 'ANSIBLE_INVENTORY_PLUGINS', '~/.ansible/plugins/inventory:/usr/share/ansible/plugins/inventory', ispathlist=True)
-DEFAULT_VARS_PLUGIN_PATH = get_config(p, DEFAULTS, 'vars_plugins', 'ANSIBLE_VARS_PLUGINS', '~/.ansible/plugins/vars:/usr/share/ansible/plugins/vars', ispathlist=True)
-DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '~/.ansible/plugins/filter:/usr/share/ansible/plugins/filter', ispathlist=True)
-DEFAULT_TEST_PLUGIN_PATH = get_config(p, DEFAULTS, 'test_plugins', 'ANSIBLE_TEST_PLUGINS', '~/.ansible/plugins/test:/usr/share/ansible/plugins/test', ispathlist=True)
-DEFAULT_STRATEGY_PLUGIN_PATH = get_config(p, DEFAULTS, 'strategy_plugins', 'ANSIBLE_STRATEGY_PLUGINS', '~/.ansible/plugins/strategy:/usr/share/ansible/plugins/strategy', ispathlist=True)
+DEFAULT_ACTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '~/.ansible/plugins/action:@PREFIX@/share/ansible/plugins/action', ispathlist=True)
+DEFAULT_CACHE_PLUGIN_PATH = get_config(p, DEFAULTS, 'cache_plugins', 'ANSIBLE_CACHE_PLUGINS', '~/.ansible/plugins/cache:@PREFIX@/share/ansible/plugins/cache', ispathlist=True)
+DEFAULT_CALLBACK_PLUGIN_PATH = get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '~/.ansible/plugins/callback:@PREFIX@/share/ansible/plugins/callback', ispathlist=True)
+DEFAULT_CONNECTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '~/.ansible/plugins/connection:@PREFIX@/share/ansible/plugins/connection', ispathlist=True)
+DEFAULT_LOOKUP_PLUGIN_PATH = get_config(p, DEFAULTS, 'lookup_plugins', 'ANSIBLE_LOOKUP_PLUGINS', '~/.ansible/plugins/lookup:@PREFIX@/share/ansible/plugins/lookup', ispathlist=True)
+DEFAULT_INVENTORY_PLUGIN_PATH = get_config(p, DEFAULTS, 'inventory_plugins', 'ANSIBLE_INVENTORY_PLUGINS', '~/.ansible/plugins/inventory:@PREFIX@/share/ansible/plugins/inventory', ispathlist=True)
+DEFAULT_VARS_PLUGIN_PATH = get_config(p, DEFAULTS, 'vars_plugins', 'ANSIBLE_VARS_PLUGINS', '~/.ansible/plugins/vars:@PREFIX@/share/ansible/plugins/vars', ispathlist=True)
+DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '~/.ansible/plugins/filter:@PREFIX@/share/ansible/plugins/filter', ispathlist=True)
+DEFAULT_TEST_PLUGIN_PATH = get_config(p, DEFAULTS, 'test_plugins', 'ANSIBLE_TEST_PLUGINS', '~/.ansible/plugins/test:@PREFIX@/share/ansible/plugins/test', ispathlist=True)
+DEFAULT_STRATEGY_PLUGIN_PATH = get_config(p, DEFAULTS, 'strategy_plugins', 'ANSIBLE_STRATEGY_PLUGINS', '~/.ansible/plugins/strategy:@PREFIX@/share/ansible/plugins/strategy', ispathlist=True)
DEFAULT_STDOUT_CALLBACK = get_config(p, DEFAULTS, 'stdout_callback', 'ANSIBLE_STDOUT_CALLBACK', 'default')
# cache
CACHE_PLUGIN = get_config(p, DEFAULTS, 'fact_caching', 'ANSIBLE_CACHE_PLUGIN', 'memory')
-DEFAULT_ACTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '~/.ansible/plugins/action:/usr/share/ansible/plugins/action', value_type='pathlist')
-DEFAULT_CACHE_PLUGIN_PATH = get_config(p, DEFAULTS, 'cache_plugins', 'ANSIBLE_CACHE_PLUGINS', '~/.ansible/plugins/cache:/usr/share/ansible/plugins/cache', value_type='pathlist')
-DEFAULT_CALLBACK_PLUGIN_PATH = get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '~/.ansible/plugins/callback:/usr/share/ansible/plugins/callback', value_type='pathlist')
-DEFAULT_CONNECTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '~/.ansible/plugins/connection:/usr/share/ansible/plugins/connection', value_type='pathlist')
-DEFAULT_LOOKUP_PLUGIN_PATH = get_config(p, DEFAULTS, 'lookup_plugins', 'ANSIBLE_LOOKUP_PLUGINS', '~/.ansible/plugins/lookup:/usr/share/ansible/plugins/lookup', value_type='pathlist')
+DEFAULT_ACTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '~/.ansible/plugins/action:@PREFIX@/share/ansible/plugins/action', value_type='pathlist')
+DEFAULT_CACHE_PLUGIN_PATH = get_config(p, DEFAULTS, 'cache_plugins', 'ANSIBLE_CACHE_PLUGINS', '~/.ansible/plugins/cache:@PREFIX@/share/ansible/plugins/cache', value_type='pathlist')
+DEFAULT_CALLBACK_PLUGIN_PATH = get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '~/.ansible/plugins/callback:@PREFIX@/share/ansible/plugins/callback', value_type='pathlist')
+DEFAULT_CONNECTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '~/.ansible/plugins/connection:@PREFIX@/share/ansible/plugins/connection', value_type='pathlist')
+DEFAULT_LOOKUP_PLUGIN_PATH = get_config(p, DEFAULTS, 'lookup_plugins', 'ANSIBLE_LOOKUP_PLUGINS', '~/.ansible/plugins/lookup:@PREFIX@/share/ansible/plugins/lookup', value_type='pathlist')
DEFAULT_MODULE_PATH = get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', None, value_type='pathlist')
DEFAULT_MODULE_UTILS_PATH = get_config(p, DEFAULTS, 'module_utils', 'ANSIBLE_MODULE_UTILS', None, value_type='pathlist')
-DEFAULT_INVENTORY_PLUGIN_PATH = get_config(p, DEFAULTS, 'inventory_plugins', 'ANSIBLE_INVENTORY_PLUGINS', '~/.ansible/plugins/inventory:/usr/share/ansible/plugins/inventory', value_type='pathlist')
-DEFAULT_VARS_PLUGIN_PATH = get_config(p, DEFAULTS, 'vars_plugins', 'ANSIBLE_VARS_PLUGINS', '~/.ansible/plugins/vars:/usr/share/ansible/plugins/vars', value_type='pathlist')
-DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '~/.ansible/plugins/filter:/usr/share/ansible/plugins/filter', value_type='pathlist')
-DEFAULT_TEST_PLUGIN_PATH = get_config(p, DEFAULTS, 'test_plugins', 'ANSIBLE_TEST_PLUGINS', '~/.ansible/plugins/test:/usr/share/ansible/plugins/test', value_type='pathlist')
-DEFAULT_STRATEGY_PLUGIN_PATH = get_config(p, DEFAULTS, 'strategy_plugins', 'ANSIBLE_STRATEGY_PLUGINS', '~/.ansible/plugins/strategy:/usr/share/ansible/plugins/strategy', value_type='pathlist')
+DEFAULT_INVENTORY_PLUGIN_PATH = get_config(p, DEFAULTS, 'inventory_plugins', 'ANSIBLE_INVENTORY_PLUGINS', '~/.ansible/plugins/inventory:@PREFIX@/share/ansible/plugins/inventory', value_type='pathlist')
+DEFAULT_VARS_PLUGIN_PATH = get_config(p, DEFAULTS, 'vars_plugins', 'ANSIBLE_VARS_PLUGINS', '~/.ansible/plugins/vars:@PREFIX@/share/ansible/plugins/vars', value_type='pathlist')
+DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '~/.ansible/plugins/filter:@PREFIX@/share/ansible/plugins/filter', value_type='pathlist')
+DEFAULT_TEST_PLUGIN_PATH = get_config(p, DEFAULTS, 'test_plugins', 'ANSIBLE_TEST_PLUGINS', '~/.ansible/plugins/test:@PREFIX@/share/ansible/plugins/test', value_type='pathlist')
+DEFAULT_STRATEGY_PLUGIN_PATH = get_config(p, DEFAULTS, 'strategy_plugins', 'ANSIBLE_STRATEGY_PLUGINS', '~/.ansible/plugins/strategy:@PREFIX@/share/ansible/plugins/strategy', value_type='pathlist')
NETWORK_GROUP_MODULES = get_config(p, DEFAULTS, 'network_group_modules','NETWORK_GROUP_MODULES', ['eos', 'nxos', 'ios', 'iosxr', 'junos',
'vyos', 'sros', 'dellos9', 'dellos10', 'dellos6'],

15
ansible/patches/patch-lib_ansible_module__utils_junos.py Normal file
View file

@ -0,0 +1,15 @@
$NetBSD$
Bump default timeout to 60 seconds.
--- lib/ansible/module_utils/junos.py.orig 2017-06-01 17:00:04.000000000 +0000
+++ lib/ansible/module_utils/junos.py
@@ -43,7 +43,7 @@ junos_argument_spec = {
# Add argument's default value here
ARGS_DEFAULT_VALUE = {
- 'timeout': 10
+ 'timeout': 60
}
def check_args(module, warnings):

64
ansible/patches/patch-lib_ansible_modules_core_network_junos_junos__config.py
View file

@ -1,64 +0,0 @@
$NetBSD$
Add NETCONF RPC timeout beyond the default value of
30 seconds. Set this value to accommodate configuration
changes (commits) that might take longer than the default
timeout interval.
From https://github.com/ganeshnalawade/ansible-modules-core/commit/da4105a45615bd59bcc138ab926765ef8bdd5cff
--- lib/ansible/modules/core/network/junos/junos_config.py.orig 2016-11-01 03:43:28.000000000 +0000
+++ lib/ansible/modules/core/network/junos/junos_config.py
@@ -113,6 +113,14 @@ options:
default: no
choices: ['yes', 'no']
version_added: "2.2"
+ timeout:
+ description:
+ - Extend the NETCONF RPC timeout beyond the default value of
+ 30 seconds. Set this value to accommodate configuration
+ changes (commits) that might take longer than the default
+ timeout interval.
+ required: false
+ default: 0
requirements:
- junos-eznc
notes:
@@ -133,6 +141,7 @@ vars:
junos_config:
src: srx.cfg
comment: update config
+ timeout: 60
provider: "{{ netconf }}"
- name: rollback the configuration to id 10
@@ -231,7 +240,7 @@ def diff_commands(commands, config):
return updates
def load_config(module, result):
- candidate = module.params['lines'] or module.params['src']
+ candidate = module.params['lines'] or module.params['src']
if isinstance(candidate, basestring):
candidate = candidate.split('\n')
@@ -282,6 +291,10 @@ def confirm_config(module, result):
result['changed'] = module.connection.confirm_commit(checkonly)
def run(module, result):
+ timeout = module.params['timeout']
+ if timeout > 0 and module.params['transport'] == 'netconf':
+ module.connection.device.timeout = timeout
+
if module.params['rollback']:
return rollback_config(module, result)
elif module.params['zeroize']:
@@ -311,6 +324,9 @@ def main():
rollback=dict(type='int'),
zeroize=dict(default=False, type='bool'),
+ # timeout
+ timeout=dict(default=0, type='int'),
+
transport=dict(default='netconf', choices=['netconf'])
)

8
ansible/patches/patch-lib_ansible_modules_extras_monitoring_nagios.py → ansible/patches/patch-lib_ansible_modules_monitoring_nagios.py
View file

@ -1,10 +1,10 @@
$NetBSD: patch-lib_ansible_modules_extras_monitoring_nagios.py,v 1.0 2016/02/24 22:44:54 tty Exp $
$NetBSD$
Add NetBSD configuration file.
--- lib/ansible/modules/extras/monitoring/nagios.py.orig 2016-02-24 13:04:03.000000000 +0000
+++ lib/ansible/modules/extras/monitoring/nagios.py
@@ -152,6 +152,8 @@ def which_cmdfile():
--- ./lib/ansible/modules/monitoring/nagios.py.orig 2017-06-01 17:00:05.000000000 +0000
+++ ./lib/ansible/modules/monitoring/nagios.py
@@ -216,6 +216,8 @@ def which_cmdfile():
'/etc/nagios2/nagios.cfg',
# bsd, solaris
'/usr/local/etc/nagios/nagios.cfg',

8
ansible/patches/patch-lib_ansible_modules_core_system_ping.py → ansible/patches/patch-lib_ansible_modules_system_ping.py
View file

@ -1,10 +1,10 @@
$NetBSD: patch-lib_ansible_modules_core_system_ping.py,v 1.0 2016/02/24 22:44:41 tty Exp $
$NetBSD$
Fix hardcoded path.
--- lib/ansible/modules/core/system/ping.py.orig 2016-02-24 13:04:03.000000000 +0000
+++ lib/ansible/modules/core/system/ping.py
@@ -27,7 +27,7 @@ short_description: Try to connect to hos
--- ./lib/ansible/modules/system/ping.py.orig 2017-06-01 17:00:05.000000000 +0000
+++ ./lib/ansible/modules/system/ping.py
@@ -33,7 +33,7 @@ short_description: Try to connect to hos
description:
- A trivial test module, this module always returns C(pong) on successful
contact. It does not make sense in playbooks, but it is useful from

14
ansible/patches/patch-lib_ansible_modules_core_system_setup.py → ansible/patches/patch-lib_ansible_modules_system_setup.py
View file

@ -1,10 +1,10 @@
$NetBSD: patch-lib_ansible_modules_core_system_setup.py,v 1.0 2016/02/24 22:44:47 tty Exp $
$NetBSD$
Fix hardcoded paths.
--- lib/ansible/modules/core/system/setup.py.orig 2016-05-25 13:00:59.000000000 +0000
+++ lib/ansible/modules/core/system/setup.py
@@ -57,11 +57,11 @@ options:
--- ./lib/ansible/modules/system/setup.py.orig 2017-06-01 17:00:05.000000000 +0000
+++ ./lib/ansible/modules/system/setup.py
@@ -62,11 +62,11 @@ options:
if a file is not executable it is read. Check notes for Windows options. (from 2.1 on)
File/results format can be json or ini-format
required: false
@ -18,12 +18,12 @@ Fix hardcoded paths.
available to a host. Ansible provides many I(facts) about the system,
automatically.
notes:
@@ -119,7 +119,7 @@ def main():
@@ -124,7 +124,7 @@ def main():
gather_subset=dict(default=["all"], required=False, type='list'),
gather_timeout=dict(default=10, required=False, type='int'),
filter=dict(default="*", required=False),
- fact_path=dict(default='/etc/ansible/facts.d', required=False),
+ fact_path=dict(default='@PKG_SYSCONFDIR@/ansible/facts.d', required=False),
- fact_path=dict(default='/etc/ansible/facts.d', required=False, type='path'),
+ fact_path=dict(default='@PKG_SYSCONFDIR@/ansible/facts.d', required=False, type='path'),
),
supports_check_mode = True,
)

17
ansible/patches/patch-lib_ansible_utils_module__docs__fragments_openstack.py Normal file
View file

@ -0,0 +1,17 @@
$NetBSD$
Fix hardcoded paths.
--- ./lib/ansible/utils/module_docs_fragments/openstack.py.orig 2017-06-01 17:00:05.000000000 +0000
+++ ./lib/ansible/utils/module_docs_fragments/openstack.py
@@ -100,8 +100,8 @@ notes:
- The standard OpenStack environment variables, such as C(OS_USERNAME)
may be used instead of providing explicit values.
- Auth information is driven by os-client-config, which means that values
- can come from a yaml config file in /etc/ansible/openstack.yaml,
- /etc/openstack/clouds.yaml or ~/.config/openstack/clouds.yaml, then from
+ can come from a yaml config file in @PKG_SYSCONFDIR@/ansible/openstack.yaml,
+ @PKG_SYSCONFDIR@/openstack/clouds.yaml or ~/.config/openstack/clouds.yaml, then from
standard environment variables, then finally by explicit parameters in
plays. More information can be found at
U(http://docs.openstack.org/developer/os-client-config)