Accepting request 458508 from home:bmaryniuk:branches:systemsmanagement:saltstack
Update to 2016.11.2 version, bugfixes OBS-URL: https://build.opensuse.org/request/show/458508 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=85
This commit is contained in:
Klaus Kämpf
committed by
Git OBS Bridge
Git OBS Bridge
parent
d74a0bd636
commit
66ae6bcfbd
163
salt.spec
163
salt.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package salt
|
||||
#
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -37,11 +37,11 @@
|
||||
%bcond_with builddocs
|
||||
|
||||
Name: salt
|
||||
Version: 2016.3.4
|
||||
Version: 2016.11.2
|
||||
Release: 0
|
||||
Summary: A parallel remote execution system
|
||||
License: Apache-2.0
|
||||
Group: System/Monitoring
|
||||
Group: System/Management
|
||||
Url: http://saltstack.org/
|
||||
# Git: https://github.com/openSUSE/salt.git
|
||||
Source0: https://pypi.io/packages/source/s/%{name}/%{name}-%{version}.tar.gz
|
||||
@@ -51,56 +51,72 @@ Source3: html.tar.bz2
|
||||
Source4: update-documentation.sh
|
||||
Source5: travis.yml
|
||||
|
||||
# PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong@suse.com -- We don't have python-systemd, so notify can't work
|
||||
# We do not upstream this patch because this is something that we have to fix on our side
|
||||
Patch1: 0001-tserong-suse.com-We-don-t-have-python-systemd-so-not.patch
|
||||
# PATCH-FIX-OPENSUSE use-salt-user-for-master.patch -- Run salt master as dedicated salt user
|
||||
# PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong@suse.com -- We don't have python-systemd, so notify can't work
|
||||
Patch1: tserong-suse.com-we-don-t-have-python-systemd-so-not.patch
|
||||
# We do not upstream this patch because this is suse custom configuration
|
||||
Patch2: 0002-Run-salt-master-as-dedicated-salt-user.patch
|
||||
# PATCH-FIX-OPENSUSE https://github.com/saltstack/salt/pull/30424
|
||||
# We do not upstream this patch because it has been fixed upstream
|
||||
# PATCH-FIX-OPENSUSE use-salt-user-for-master.patch -- Run salt master as dedicated salt user
|
||||
Patch2: run-salt-master-as-dedicated-salt-user.patch
|
||||
# (see: https://trello.com/c/wh96lCD4/1528-get-rid-of-0003-check-if-byte-strings-are-properly-encoded-in-utf-8-patch-in-the-salt-package)
|
||||
Patch3: 0003-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch
|
||||
# PATCH-FIX-OPENSUSE prevent rebuilds in OBS
|
||||
# We do not upstream this patch because it has been fixed upstream
|
||||
# PATCH-FIX-OPENSUSE https://github.com/saltstack/salt/pull/30424
|
||||
Patch3: check-if-byte-strings-are-properly-encoded-in-utf-8.patch
|
||||
# We do not upstream this patch because the issue is on our side
|
||||
Patch4: 0004-do-not-generate-a-date-in-a-comment-to-prevent-rebui.patch
|
||||
# PATCH-FIX-OPENSUSE - Upstream default hash type is set to MD5, while we require SHA256 (bsc#955373)
|
||||
# PR https://github.com/saltstack/salt/pull/35341 (15.08.2016 - not merged yet)
|
||||
Patch5: 0005-Use-SHA256-hash-type-by-default.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/31798
|
||||
# PR already merged. This will be gone in the next version
|
||||
Patch6: 0006-Create-salt-proxy-instantiated-service-file.patch
|
||||
# PATCH-FIX-OPENSUSE prevent rebuilds in OBS
|
||||
Patch4: do-not-generate-a-date-in-a-comment-to-prevent-rebui.patch
|
||||
# We do not upstream this because this is for SUSE only (15.08.2016)
|
||||
# PATCH-FIX-OPENSUSE Generate events from the Salt minion,
|
||||
# if Zypper has been used outside the Salt infrastructure
|
||||
# We do not upstream this because this is for SUSE only (15.08.2016)
|
||||
Patch7: 0007-Add-zypp-notify-plugin.patch
|
||||
# PATCH-FIX_UPSTREAM
|
||||
Patch8: 0008-snapper-execution-module.patch
|
||||
# PATCH-FIX_UPSTREAM
|
||||
Patch9: 0009-fix-salt-summary-to-count-not-responding-minions-cor.patch
|
||||
Patch5: add-zypp-notify-plugin.patch
|
||||
# PATCH-FIX_OPENSUSE
|
||||
Patch10: 0010-Run-salt-api-as-user-salt-bsc-990029.patch
|
||||
# PATCH-FIX_UPSTREAM
|
||||
Patch11: 0011-Fix-snapper_test-for-python26.patch
|
||||
# PATCH-FIX_UPSTREAM
|
||||
Patch12: 0012-Fix-pkg.upgrade-for-zypper.patch
|
||||
# PATCH-FIX_UPSTREAM
|
||||
Patch13: 0013-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch
|
||||
# PATCH-FIX_UPSTREAM
|
||||
Patch14: 0014-acl.delfacl-fix-position-of-X-option-to-setfacl.patch
|
||||
Patch6: run-salt-api-as-user-salt-bsc-990029.patch
|
||||
# PATCH-FIX_OPENSUSE
|
||||
Patch15: 0015-Change-travis-configuration-file-to-use-salt-toaster.patch
|
||||
# PATCH-FIX_UPSTREAM
|
||||
Patch16: 0016-Fix-pkg.latest_version-when-latest-already-installed.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/37430
|
||||
Patch17: 0017-Including-resolver-params-for-Zypper-debug-solver.patch
|
||||
Patch7: change-travis-configuration-file-to-use-salt-toaster.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/37856 (pending to include in 2016.11)
|
||||
Patch8: setting-up-os-grains-for-sles-expanded-support-suse-.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/34165
|
||||
Patch9: fix-salt-summary-to-count-not-responding-minions-cor.patch
|
||||
# PATCH-FIX_OPENSUSE
|
||||
Patch10: avoid-failures-on-sles-12-sp2-because-of-new-systemd.patch
|
||||
# PATCH-FIX_OPENSUSE
|
||||
Patch11: add-yum-plugin.patch
|
||||
# PATCH-FIX_OPENSUSE
|
||||
Patch12: add-ssh-option-to-salt-ssh.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38639/commits
|
||||
Patch13: fix-a-typo-for-master-comments.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38806
|
||||
Patch14: add-a-salt-minion-service-control-file.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38824
|
||||
Patch15: add-buildargs-option-to-dockerng.build.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38885
|
||||
Patch16: increasing-timeouts-for-running-integrations-tests.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38957
|
||||
Patch17: fix-timezone-handling-for-rpm-installtime-bsc-101707.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38940/commits
|
||||
Patch18: fix-leading-dots-on-sanitized-hostname.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/38991
|
||||
Patch19: prevent-crash-on-unknown-to-the-repo-package.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39111
|
||||
Patch20: docker-buildargs-require-minimal-dockerpy-1.6.0-and-.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39179
|
||||
Patch21: fix-error-parsing.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39162
|
||||
Patch22: snapper-module-improvements.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39278
|
||||
Patch23: support-dryrun-for-dockerng.sls_build.patch
|
||||
# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/39400
|
||||
Patch24: prevents-oserror-exception-in-case-path-doesn-t-exis.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: logrotate
|
||||
BuildRequires: python
|
||||
BuildRequires: python-devel
|
||||
# requirements/base.txt
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: python-jinja2
|
||||
%else
|
||||
BuildRequires: python-Jinja2
|
||||
%endif
|
||||
BuildRequires: python-futures >= 2.0
|
||||
BuildRequires: python-markupsafe
|
||||
BuildRequires: python-msgpack-python > 0.3
|
||||
@@ -160,7 +176,12 @@ Requires: python
|
||||
Requires: python-certifi
|
||||
%endif
|
||||
# requirements/base.txt
|
||||
%if 0%{?rhel}
|
||||
Requires: python-jinja2
|
||||
Requires: yum
|
||||
%else
|
||||
Requires: python-Jinja2
|
||||
%endif
|
||||
Requires: python-futures >= 2.0
|
||||
Requires: python-markupsafe
|
||||
Requires: python-msgpack-python > 0.3
|
||||
@@ -217,6 +238,10 @@ BuildRequires: bash
|
||||
BuildRequires: zsh
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: yum
|
||||
%endif
|
||||
|
||||
%description
|
||||
Salt is a distributed remote execution system used to execute commands and
|
||||
query data. It was developed in order to bring the best solutions found in
|
||||
@@ -227,7 +252,7 @@ servers, handle them quickly and through a simple and manageable interface.
|
||||
|
||||
%package api
|
||||
Summary: The api for Salt a parallel remote execution system
|
||||
Group: System/Monitoring
|
||||
Group: System/Management
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}-master = %{version}-%{release}
|
||||
Requires: python-CherryPy >= 3.2.2
|
||||
@@ -237,7 +262,7 @@ salt-api is a modular interface on top of Salt that can provide a variety of ent
|
||||
|
||||
%package cloud
|
||||
Summary: Generic cloud provisioning tool for Saltstack
|
||||
Group: System/Monitoring
|
||||
Group: System/Management
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}-master = %{version}-%{release}
|
||||
Requires: python-apache-libcloud
|
||||
@@ -263,7 +288,7 @@ This contains the documentation of salt, it is an offline version of http://docs
|
||||
|
||||
%package master
|
||||
Summary: The management component of Saltstack both protocols zmq and raet supported
|
||||
Group: System/Monitoring
|
||||
Group: System/Management
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if 0%{?suse_version}
|
||||
Recommends: python-pygit2 >= 0.20.3
|
||||
@@ -295,8 +320,9 @@ than serially.
|
||||
|
||||
%package minion
|
||||
Summary: The client component for Saltstack
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Group: System/Management
|
||||
Requires(pre): %{name} = %{version}-%{release}
|
||||
|
||||
%if %{with systemd}
|
||||
%{?systemd_requires}
|
||||
%else
|
||||
@@ -314,7 +340,7 @@ Listens to the salt master and execute the commands.
|
||||
|
||||
%package raet
|
||||
Summary: Raet Support for Saltstack
|
||||
Group: System/Monitoring
|
||||
Group: System/Management
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: python-enum34
|
||||
Requires: python-ioflo >= 1.1.7
|
||||
@@ -336,7 +362,7 @@ for trust to be established.
|
||||
|
||||
%package proxy
|
||||
Summary: Component for salt that enables controlling arbitrary devices
|
||||
Group: System/Monitoring
|
||||
Group: System/Management
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if %{with systemd}
|
||||
%{?systemd_requires}
|
||||
@@ -359,7 +385,7 @@ security reasons, will not.
|
||||
|
||||
%package syndic
|
||||
Summary: The syndic component for saltstack
|
||||
Group: System/Monitoring
|
||||
Group: System/Management
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}-master = %{version}-%{release}
|
||||
%if %{with systemd}
|
||||
@@ -380,7 +406,7 @@ the management of multiple masters at a time..
|
||||
|
||||
%package ssh
|
||||
Summary: Management component for Saltstack with ssh protocol
|
||||
Group: System/Monitoring
|
||||
Group: System/Management
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}-master = %{version}-%{release}
|
||||
%if 0%{?suse_version}
|
||||
@@ -453,13 +479,14 @@ cp %{S:5} ./.travis.yml
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
# This is SUSE-only patch
|
||||
%if 0%{?suse_version}
|
||||
%patch7 -p1
|
||||
%patch5 -p1
|
||||
%endif
|
||||
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
@@ -470,6 +497,13 @@ cp %{S:5} ./.travis.yml
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
|
||||
%build
|
||||
%{__python} setup.py --salt-transport=both build
|
||||
@@ -507,6 +541,7 @@ install -Dd -m 0750 %{buildroot}%{_localstatedir}/cache/salt/master/queues
|
||||
install -Dd -m 0750 %{buildroot}%{_localstatedir}/cache/salt/master/roots
|
||||
install -Dd -m 0750 %{buildroot}%{_localstatedir}/cache/salt/master/syndics
|
||||
install -Dd -m 0750 %{buildroot}%{_localstatedir}/cache/salt/master/tokens
|
||||
install -Dd -m 0750 %{buildroot}/var/lib/salt
|
||||
install -Dd -m 0750 %{buildroot}/srv/salt
|
||||
install -Dd -m 0750 %{buildroot}/srv/pillar
|
||||
install -Dd -m 0750 %{buildroot}/srv/spm
|
||||
@@ -532,13 +567,21 @@ install -Dd -m 0750 %{buildroot}%{_prefix}/lib/zypp/plugins/commit
|
||||
%{__install} scripts/zypper/plugins/commit/zyppnotify %{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify
|
||||
%endif
|
||||
|
||||
# Install Yum plugins only on RH machines
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
install -Dd %{buildroot}%{_prefix}/share/yum-plugins
|
||||
install -Dd %{buildroot}/etc/yum/pluginconf.d
|
||||
%{__install} scripts/yum/plugins/yumnotify.py %{buildroot}%{_prefix}/share/yum-plugins
|
||||
%{__install} scripts/yum/plugins/yumnotify.conf %{buildroot}/etc/yum/pluginconf.d
|
||||
%endif
|
||||
|
||||
## install init and systemd scripts
|
||||
%if %{with systemd}
|
||||
install -Dpm 0644 pkg/salt-master.service %{buildroot}%{_unitdir}/salt-master.service
|
||||
install -Dpm 0644 pkg/salt-minion.service %{buildroot}%{_unitdir}/salt-minion.service
|
||||
install -Dpm 0644 pkg/suse/salt-minion.service %{buildroot}%{_unitdir}/salt-minion.service
|
||||
install -Dpm 0644 pkg/salt-syndic.service %{buildroot}%{_unitdir}/salt-syndic.service
|
||||
install -Dpm 0644 pkg/salt-api.service %{buildroot}%{_unitdir}/salt-api.service
|
||||
install -Dpm 0644 pkg/salt-proxy@.service %{buildroot}%{_unitdir}/salt-proxy@.service
|
||||
install -Dpm 0644 pkg/salt-proxy@.service %{buildroot}%{_unitdir}/salt-proxy@.service
|
||||
ln -s service %{buildroot}%{_sbindir}/rcsalt-master
|
||||
ln -s service %{buildroot}%{_sbindir}/rcsalt-syndic
|
||||
ln -s service %{buildroot}%{_sbindir}/rcsalt-minion
|
||||
@@ -601,8 +644,9 @@ python setup.py test --runtests-opts=-u
|
||||
%endif
|
||||
|
||||
%pre
|
||||
getent passwd salt | grep srv\/salt >/dev/null && usermod -d /var/lib/salt salt
|
||||
getent group salt >/dev/null || %{_sbindir}/groupadd -r salt
|
||||
getent passwd salt >/dev/null || %{_sbindir}/useradd -r -g salt -d /srv/salt -s /bin/false -c "salt-master daemon" salt
|
||||
getent passwd salt >/dev/null || %{_sbindir}/useradd -r -g salt -d /var/lib/salt -s /bin/false -c "salt-master daemon" salt
|
||||
|
||||
%post
|
||||
%if %{with systemd}
|
||||
@@ -617,11 +661,6 @@ dbus-uuidgen --ensure
|
||||
%else
|
||||
%if 0%{?suse_version}
|
||||
%stop_on_removal salt-proxy
|
||||
%else
|
||||
if [ $1 -eq 0 ] ; then
|
||||
/sbin/service salt-proxy stop >/dev/null 2>&1
|
||||
/sbin/chkconfig --del salt-proxy
|
||||
fi
|
||||
%endif
|
||||
%endif
|
||||
|
||||
@@ -879,6 +918,12 @@ fi
|
||||
%{_prefix}/lib/zypp/plugins/commit/zyppnotify
|
||||
%endif
|
||||
|
||||
# Install Yum plugins only on RH machines
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%{_prefix}/share/yum-plugins/
|
||||
/etc/yum/pluginconf.d/yumnotify.conf
|
||||
%endif
|
||||
|
||||
%if %{with systemd}
|
||||
%{_unitdir}/salt-minion.service
|
||||
%else
|
||||
@@ -922,6 +967,7 @@ fi
|
||||
%dir %attr(0750, salt, salt) %{_sysconfdir}/salt/pki/master/minions_denied/
|
||||
%dir %attr(0750, salt, salt) %{_sysconfdir}/salt/pki/master/minions_pre/
|
||||
%dir %attr(0750, salt, salt) %{_sysconfdir}/salt/pki/master/minions_rejected/
|
||||
%dir %attr(0755, salt, salt) /var/lib/salt
|
||||
%dir %attr(0755, root, salt) /srv/salt
|
||||
%dir %attr(0755, root, salt) /srv/pillar
|
||||
%dir %attr(0750, salt, salt) %{_localstatedir}/cache/salt/master/
|
||||
@@ -961,6 +1007,7 @@ fi
|
||||
%if %{with systemd}
|
||||
/usr/lib/tmpfiles.d/salt.conf
|
||||
%endif
|
||||
%{_mandir}/man1/salt.1.*
|
||||
|
||||
%if %{with docs}
|
||||
%files doc
|
||||
|
||||
Reference in New Issue
Block a user