Accepting request 620440 from home:bmanojlovic:branches:systemsmanagement
- revert some unneeded changes from spec-cleaner - updated to latest release 2.6.0 - New Plugins: + Callback: - cgroup_memory_recap - grafana_annotations - sumologic + Connection: - httpapi + Inventory: - foreman - gcp_compute - generator - nmap + Lookup: - onepassword - onepassword_raw - Modules updates too many to mention here please look at package documentation directory (/usr/share/doc/packages/.../changelogs) - bug fixes: - **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 coul d 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) - use python3 on (open)SUSE 15 or newer OBS-URL: https://build.opensuse.org/request/show/620440 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ansible?expand=0&rev=112
This commit is contained in:
parent
a621514742
commit
22f2fea7d3
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:d7e5aae60c0e76c824bf8a410fe247b5c4afcfaee272f6283b4f996d237e365a
|
|
||||||
size 10150862
|
|
3
ansible-2.6.0.tar.gz
Normal file
3
ansible-2.6.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:3550bf16bf2c34cc88bf3870e91b836e44c1c288d148968c4d855dae2560faf5
|
||||||
|
size 10721104
|
208
ansible.changes
208
ansible.changes
@ -1,3 +1,211 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 2 17:23:10 UTC 2018 - mrueckert@suse.de
|
||||||
|
|
||||||
|
- revert some unneeded changes from spec-cleaner
|
||||||
|
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 2 11:38:41 UTC 2018 - boris@steki.net
|
||||||
|
|
||||||
|
- updated to latest release 2.6.0
|
||||||
|
- New Plugins:
|
||||||
|
+ Callback:
|
||||||
|
- cgroup_memory_recap
|
||||||
|
- grafana_annotations
|
||||||
|
- sumologic
|
||||||
|
+ Connection:
|
||||||
|
- httpapi
|
||||||
|
+ Inventory:
|
||||||
|
- foreman
|
||||||
|
- gcp_compute
|
||||||
|
- generator
|
||||||
|
- nmap
|
||||||
|
+ Lookup:
|
||||||
|
- onepassword
|
||||||
|
- onepassword_raw
|
||||||
|
- Modules updates too many to mention here
|
||||||
|
please look at package documentation directory (/usr/share/doc/packages/.../changelogs)
|
||||||
|
- bug fixes:
|
||||||
|
- **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 coul d 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)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jun 26 13:55:07 UTC 2018 - mrueckert@suse.de
|
||||||
|
|
||||||
|
- use python3 on (open)SUSE 15 or newer
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jun 15 13:49:23 UTC 2018 - kbabioch@suse.com
|
Fri Jun 15 13:49:23 UTC 2018 - kbabioch@suse.com
|
||||||
|
|
||||||
|
95
ansible.spec
95
ansible.spec
@ -2,6 +2,8 @@
|
|||||||
# spec file for package ansible
|
# spec file for package ansible
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
|
# Copyright 2013 by Lars Vogdt
|
||||||
|
# Copyright 2014 by Boris Manojlovic
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -16,26 +18,25 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%if 0%{?suse_version} && 0%{?suse_version} >= 1500
|
||||||
|
%bcond_without python3
|
||||||
|
%else
|
||||||
|
%bcond_with python3
|
||||||
|
%endif
|
||||||
|
%if %{with python3}
|
||||||
|
%define __python %{__python3}
|
||||||
|
%define python python3
|
||||||
|
%else
|
||||||
|
%define python python
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1110 || 0%{?rhel} == 5
|
%if 0%{?suse_version} && 0%{?suse_version} <= 1110 || 0%{?rhel} == 5
|
||||||
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||||
%else
|
%else
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} >= 18
|
|
||||||
%define __python python2
|
|
||||||
BuildRequires: python-devel
|
|
||||||
BuildRequires: python-setuptools
|
|
||||||
Requires: PyYAML
|
|
||||||
Requires: python-httplib2
|
|
||||||
Requires: python-jinja2
|
|
||||||
Requires: python-keyczar
|
|
||||||
Requires: python-paramiko
|
|
||||||
Requires: python-setuptools
|
|
||||||
Requires: python-six
|
|
||||||
Requires: sshpass
|
|
||||||
%endif
|
|
||||||
Name: ansible
|
Name: ansible
|
||||||
Version: 2.5.5
|
Version: 2.6.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Software automation engine
|
Summary: Software automation engine
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
@ -45,26 +46,30 @@ Source: https://releases.ansible.com/ansible/ansible-%{version}.tar.gz
|
|||||||
Source99: ansible-rpmlintrc
|
Source99: ansible-rpmlintrc
|
||||||
# SuSE/openSuSE
|
# SuSE/openSuSE
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
|
%if %{with python3}
|
||||||
|
BuildRequires: python3-devel >= 3.5
|
||||||
|
%else
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
BuildRequires: python-setuptools
|
%endif
|
||||||
Requires: python-setuptools
|
BuildRequires: %{python}-setuptools
|
||||||
Recommends: python-dnspython
|
Recommends: %{python}-dnspython
|
||||||
Recommends: python-dopy
|
Recommends: %{python}-dopy
|
||||||
Recommends: python-httplib2
|
Recommends: %{python}-pywinrm
|
||||||
Recommends: python-keyczar
|
|
||||||
Recommends: python-pywinrm
|
|
||||||
Recommends: python-six
|
|
||||||
Recommends: sshpass
|
Recommends: sshpass
|
||||||
|
Recommends: %{python}-httplib2
|
||||||
|
Recommends: %{python}-keyczar
|
||||||
|
Recommends: %{python}-six
|
||||||
|
Requires: %{python}-setuptools
|
||||||
%if 0%{?suse_version} >= 01130
|
%if 0%{?suse_version} >= 01130
|
||||||
BuildRequires: python-Jinja2
|
BuildRequires: %{python}-Jinja2
|
||||||
BuildRequires: python-PyYAML
|
BuildRequires: %{python}-PyYAML
|
||||||
BuildRequires: python-paramiko
|
BuildRequires: %{python}-paramiko
|
||||||
BuildRequires: python-pycrypto >= 2.6
|
BuildRequires: %{python}-pycrypto >= 2.6
|
||||||
Requires: python-Jinja2
|
Requires: %{python}-Jinja2
|
||||||
Requires: python-PyYAML
|
Requires: %{python}-PyYAML
|
||||||
Requires: python-paramiko
|
Requires: %{python}-paramiko
|
||||||
Requires: python-passlib
|
Requires: %{python}-passlib
|
||||||
Requires: python-pycrypto >= 2.6
|
Requires: %{python}-pycrypto >= 2.6
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
# RHEL <=5
|
# RHEL <=5
|
||||||
@ -97,8 +102,21 @@ Requires: python-crypto
|
|||||||
%endif
|
%endif
|
||||||
# RHEL >=7
|
# RHEL >=7
|
||||||
%if 0%{?rhel} >= 7
|
%if 0%{?rhel} >= 7
|
||||||
BuildRequires: perl(Exporter)
|
|
||||||
Requires: python2-cryptography
|
Requires: python2-cryptography
|
||||||
|
BuildRequires: perl(Exporter)
|
||||||
|
%endif
|
||||||
|
%if 0%{?fedora} >= 18
|
||||||
|
BuildRequires: python-devel
|
||||||
|
BuildRequires: python-setuptools
|
||||||
|
Requires: PyYAML
|
||||||
|
Requires: python-httplib2
|
||||||
|
Requires: python-jinja2
|
||||||
|
Requires: python-keyczar
|
||||||
|
Requires: python-paramiko
|
||||||
|
Requires: python-setuptools
|
||||||
|
Requires: python-six
|
||||||
|
Requires: sshpass
|
||||||
|
%define __python %{__python2}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -113,10 +131,10 @@ find . -name .git_keep -delete
|
|||||||
find contrib/ -type f -exec chmod 644 {} +
|
find contrib/ -type f -exec chmod 644 {} +
|
||||||
|
|
||||||
%build
|
%build
|
||||||
python setup.py build
|
%{__python} setup.py build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/ansible/
|
mkdir -p %{buildroot}%{_sysconfdir}/ansible/
|
||||||
cp examples/hosts %{buildroot}%{_sysconfdir}/ansible/
|
cp examples/hosts %{buildroot}%{_sysconfdir}/ansible/
|
||||||
@ -126,7 +144,12 @@ cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/
|
|||||||
mkdir -p %{buildroot}/%{_datadir}/ansible
|
mkdir -p %{buildroot}/%{_datadir}/ansible
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%if 0%{?suse_version} >= 1200
|
||||||
%license COPYING
|
%license COPYING
|
||||||
|
%else
|
||||||
|
%doc COPYING
|
||||||
|
%endif
|
||||||
%doc *.rst contrib examples changelogs
|
%doc *.rst contrib examples changelogs
|
||||||
%{_bindir}/ansible
|
%{_bindir}/ansible
|
||||||
%{_bindir}/ansible-config
|
%{_bindir}/ansible-config
|
||||||
@ -138,7 +161,11 @@ mkdir -p %{buildroot}/%{_datadir}/ansible
|
|||||||
%{_bindir}/ansible-playbook
|
%{_bindir}/ansible-playbook
|
||||||
%{_bindir}/ansible-pull
|
%{_bindir}/ansible-pull
|
||||||
%{_bindir}/ansible-vault
|
%{_bindir}/ansible-vault
|
||||||
|
%if %{with python3}
|
||||||
|
%{python3_sitelib}/*
|
||||||
|
%else
|
||||||
%{python_sitelib}/*
|
%{python_sitelib}/*
|
||||||
|
%endif
|
||||||
%{_mandir}/man1/ansible.1%{?ext_man}
|
%{_mandir}/man1/ansible.1%{?ext_man}
|
||||||
%{_mandir}/man1/ansible-config.1%{?ext_man}
|
%{_mandir}/man1/ansible-config.1%{?ext_man}
|
||||||
%{_mandir}/man1/ansible-console.1%{?ext_man}
|
%{_mandir}/man1/ansible-console.1%{?ext_man}
|
||||||
|
Loading…
Reference in New Issue
Block a user