git.iko.soy/typeable/nixpkgs
on master help sign in
Ansible: Fix connection plugins and add support for NETCONF (#72370)

* ansible: Fix use of connection plugins Ansible tries to execute the ansible-connection script as a python script from within it's task executor. This does not work when it is encapsulated in a shell script. Therefore remove the call to the python interpreter and use the wrapped version directly. Fixes #71342 * ansible: Add ncclient to support NETCONF connections * ansible: Some cleanups - boto was dropped from propagatedBuildInputs in 4af94d0f - lib/ansible/constants.py does not have "/usr" anywhere in v2.4..v2.9

commit2bb4191613390c1e44018c317b028447595e8fe9 authorMartin Weinelt <mweinelt@users.noreply.github.com> dateWed 20 Nov 2019, 14:55 (7 years ago) parent39ecc2d
1 file changed+5−3
pkgs/development/python-modules/ansible/default.nix+5−3
pkgs/development/python-modules/ansible/default.nix+5−3
@@ -6,12 +6,12 @@
66, jinja2
77, pyyaml
88, httplib2
9−, boto
109, six
1110, netaddr
1211, dnspython
1312, jmespath
1413, dopy
14+, ncclient
1515, windowsSupport ? false
1616, pywinrm
1717}:
@@ -28,7 +28,9 @@ buildPythonPackage rec {
2828 };
2929
3030 prePatch = ''
31− sed -i "s,/usr/,$out," lib/ansible/constants.py
31+ # ansible-connection is wrapped, so make sure it's not passed
32+ # through the python interpreter.
33+ sed -i "s/\[python, /[/" lib/ansible/executor/task_executor.py
3234 '';
3335
3436 postInstall = ''
@@ -39,7 +41,7 @@ buildPythonPackage rec {
3941
4042 propagatedBuildInputs = [
4143 pycrypto paramiko jinja2 pyyaml httplib2
42− six netaddr dnspython jmespath dopy
44+ six netaddr dnspython jmespath dopy ncclient
4345 ] ++ lib.optional windowsSupport pywinrm;
4446
4547 # dificult to test