mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 00:55:19 +00:00
Updated suse spec file to salt 2014.7
This commit is contained in:
Niels Abspoel
parent
7acc6949c6
commit
3d9fa5ce1c
@ -1,4 +1,80 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 3 21:35:31 UTC 2014 - aboe76@gmail.com
|
||||
|
||||
- Updated to Major Release 2014.7.0
|
||||
- added python-zipp as depency
|
||||
- added recommend python-pygit2, this is the preferred gitfs backend of saltstack
|
||||
- added zsh-completion package
|
||||
- More information at: http://docs.saltstack.com/en/latest/topics/releases/2014.7.0.html
|
||||
- SALT SSH ENHANCEMENTS:
|
||||
+ Support for Fileserver Backends
|
||||
+ Support for Saltfile
|
||||
+ Ext Pillar
|
||||
+ No more sshpass needed
|
||||
+ Pure Python Shim
|
||||
+ Custom Module Delivery
|
||||
+ CP module Support
|
||||
+ More Thin Directory Options
|
||||
- Salt State System enhancements:
|
||||
+ New Imperative State Keyword "Listen"
|
||||
+ New Mod Aggregate Runtime Manipulator
|
||||
+ New Requisites: onchanges and onfail
|
||||
+ New Global onlyif and unless
|
||||
+ Use names to expand and override values
|
||||
- Salt Major Features:
|
||||
+ Improved Scheduler Additions
|
||||
+ Red Hat 7 Support
|
||||
+ Fileserver Backends in Salt-call
|
||||
+ Amazon Execution Modules in salt-cloud
|
||||
+ LXC Runner Enhancements
|
||||
+ Next Gen Docker Management
|
||||
+ Peer System Performance Improvements
|
||||
+ SDB Encryption at rest for configs
|
||||
+ GPG Renderer encrypted pillar at rest
|
||||
+ OpenStack Expansions
|
||||
+ Queues System external queue systems into Salt events
|
||||
+ Multi Master Failover Additions
|
||||
+ Chef Execution Module
|
||||
- salt-api Project Merge
|
||||
+ Synchronous and Asynchronous Execution of Runner and Wheel Modules
|
||||
+ rest_cherrypy Additions
|
||||
+ Web Hooks
|
||||
- Fileserver Backend Enhancements:
|
||||
+ New gitfs Features
|
||||
+ Pygit2 and Dulwich support
|
||||
+ Mountpoints support
|
||||
+ New hgfs Features
|
||||
+ mountpoints support
|
||||
+ New svnfs Features:
|
||||
+ mountpoints
|
||||
+ minionfs Featuressupport
|
||||
+ mountpoints
|
||||
- New Salt Modules:
|
||||
+ Oracle
|
||||
+ Random
|
||||
+ Redis
|
||||
+ Amazon Simple Queue Service
|
||||
+ Block Device Management
|
||||
+ CoreOS etcd
|
||||
+ Genesis
|
||||
+ InfluxDB
|
||||
+ Server Density
|
||||
+ Twilio Notifications
|
||||
+ Varnish
|
||||
+ ZNC IRC Bouncer
|
||||
+ SMTP
|
||||
- NEW RUNNERS:
|
||||
+ Map/Reduce Style
|
||||
+ Queue
|
||||
- NEW EXTERNAL PILLARS:
|
||||
+ CoreOS etcd
|
||||
- NEW SALT-CLOUD PROVIDERS:
|
||||
+ Aliyun ECS Cloud
|
||||
+ LXC Containers
|
||||
+ Proxmox (OpenVZ containers & KVM)
|
||||
- DEPRECATIONS:
|
||||
+ Salt.modules.virtualenv_mod
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 16 19:26:57 UTC 2014 - aboe76@gmail.com
|
||||
|
||||
- Updated to 2014.1.13 a bugfix release on 2014.1.12
|
||||
|
||||
@ -16,25 +16,16 @@
|
||||
#
|
||||
|
||||
Name: salt
|
||||
Version: 2014.1.13
|
||||
Version: 2014.7.0
|
||||
Release: 0
|
||||
Summary: A parallel remote execution system
|
||||
License: Apache-2.0
|
||||
Group: System/Monitoring
|
||||
Url: http://saltstack.org/
|
||||
Source0: http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM allow-systemd-units-no-unit-files.patch tserong@suse.com -- allow salt to detect init script services
|
||||
Patch1: allow-systemd-units-no-unit-files.patch
|
||||
# PATCH-FIX-UPSTREAM allow-systemd-units-no-unit-files.patch tserong@suse.com -- part 2 of above fix
|
||||
Patch2: allow-systemd-parameterized-services.patch
|
||||
# PATCH-FIX-UPSTREAM pass-all-systemd-list-units.patch tserong@suse.com -- part 3 of above fix
|
||||
Patch3: pass-all-systemd-list-units.patch
|
||||
|
||||
# PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong@suse.com -- We don't have python-systemd, so notify can't work
|
||||
Patch4: use-forking-daemon.patch
|
||||
# PATCH-FIX-UPSTREAM disable-service-py-for-suse-family.patch tserong@suse.com -- ensure salt uses systemd for services on SLES
|
||||
Patch5: disable-service-py-for-suse-family.patch
|
||||
# PATCH-FIX-UPSTREAM fix-service-py-version-parsing-sles.patch tserong@suse.com -- fix SLES 11 version parsing
|
||||
Patch6: fix-service-py-version-parsing-sles.patch
|
||||
Patch1: use-forking-daemon.patch
|
||||
|
||||
#for building
|
||||
BuildRequires: fdupes
|
||||
@ -48,7 +39,7 @@ BuildRequires: python-msgpack-python
|
||||
BuildRequires: python-psutil
|
||||
BuildRequires: python-pycrypto
|
||||
BuildRequires: python-pyzmq
|
||||
BuildRequires: python-requests
|
||||
BuildRequires: python-requests >= 1.0.0
|
||||
BuildRequires: python-yaml
|
||||
|
||||
%if 0%{?sles_version}
|
||||
@ -83,6 +74,7 @@ Requires: python-requests
|
||||
Requires: python-xml
|
||||
Requires: python-yaml
|
||||
Requires: python-yaml
|
||||
Requires: python-zypp
|
||||
Requires(pre): %fillup_prereq
|
||||
%if 0%{?suse_version} < 1210
|
||||
Requires(pre): %insserv_prereq
|
||||
@ -96,6 +88,7 @@ Requires(pre): %insserv_prereq
|
||||
|
||||
%if %with_bashcomp
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: zsh
|
||||
%endif #with_bashcomp
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -107,6 +100,7 @@ BuildArch: noarch
|
||||
|
||||
Recommends: python-botocore
|
||||
Recommends: python-netaddr
|
||||
Recommends: python-pygit2
|
||||
|
||||
%description
|
||||
Salt is a distributed remote execution system used to execute commands and
|
||||
@ -116,13 +110,22 @@ malleable. Salt accomplishes this via its ability to handle larger loads of
|
||||
information, and not just dozens, but hundreds or even thousands of individual
|
||||
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
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name}-master = %{version}
|
||||
Recommends: python-CherryPy
|
||||
|
||||
%description api
|
||||
salt-api is a modular interface on top of Salt that can provide a variety of entry points into a running Salt system.
|
||||
|
||||
%package cloud
|
||||
Summary: Salt Cloud is a generic cloud provisioning tool
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}
|
||||
Requires: python-PyYAML
|
||||
Requires: python-apache-libcloud
|
||||
Recommends: sshpass
|
||||
Recommends: python-botocore
|
||||
Recommends: python-netaddr
|
||||
|
||||
@ -149,10 +152,10 @@ Group: System/Monitoring
|
||||
Requires: %{name} = %{version}
|
||||
%if 0%{?suse_version} == 1315
|
||||
Recommends: git
|
||||
Recommends: python-GitPython
|
||||
Recommends: python-pygit2
|
||||
%else
|
||||
Requires: git
|
||||
Requires: python-GitPython
|
||||
Requires: python-pygit2
|
||||
%endif
|
||||
Requires: python-M2Crypto
|
||||
Requires: python-msgpack-python
|
||||
@ -212,7 +215,6 @@ Group: System/Monitoring
|
||||
Requires: %{name} = %{version}
|
||||
BuildRequires: python-markupsafe
|
||||
Requires: python-markupsafe
|
||||
Recommends: sshpass
|
||||
%if 0%{?suse_version} < 1210
|
||||
Requires(pre): %insserv_prereq
|
||||
%endif
|
||||
@ -234,16 +236,22 @@ BuildArch: noarch
|
||||
%description bash-completion
|
||||
Bash command line completion support for %{name}.
|
||||
|
||||
%package zsh-completion
|
||||
Summary: Zsh Completion for %{name}
|
||||
Group: System/Management
|
||||
Conflicts: salt-zsh-completion
|
||||
Requires: %{name} = %{version}
|
||||
Requires: zsh
|
||||
BuildArch: noarch
|
||||
|
||||
%description zsh-completion
|
||||
Zsh command line completion support for %{name}.
|
||||
|
||||
%endif # with_bashcomp
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
%build
|
||||
python setup.py build
|
||||
@ -279,17 +287,21 @@ mkdir -p %{buildroot}%{_docdir}/salt
|
||||
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/salt-syndic.service %{buildroot}%_unitdir/salt-syndic.service
|
||||
install -Dpm 0644 pkg/salt-api.service %{buildroot}%_unitdir/salt-api.service
|
||||
ln -s service %{buildroot}%{_sbindir}/rcsalt-master
|
||||
ln -s service %{buildroot}%{_sbindir}/rcsalt-syndic
|
||||
ln -s service %{buildroot}%{_sbindir}/rcsalt-minion
|
||||
ln -s service %{buildroot}%{_sbindir}/rcsalt-api
|
||||
%else
|
||||
## install init scripts
|
||||
install -Dpm 0755 pkg/suse/salt-master %{buildroot}%{_initddir}/salt-master
|
||||
install -Dpm 0755 pkg/suse/salt-syndic %{buildroot}%{_initddir}/salt-syndic
|
||||
install -Dpm 0755 pkg/suse/salt-minion %{buildroot}%{_initddir}/salt-minion
|
||||
install -Dpm 0755 pkg/suse/salt-api %{buildroot}%{_initddir}/salt-api
|
||||
ln -sf %{_initddir}/salt-master %{buildroot}%{_sbindir}/rcsalt-master
|
||||
ln -sf %{_initddir}/salt-syndic %{buildroot}%{_sbindir}/rcsalt-syndic
|
||||
ln -sf %{_initddir}/salt-minion %{buildroot}%{_sbindir}/rcsalt-minion
|
||||
ln -sf %{_initddir}/salt-api %{buildroot}%{_sbindir}/rcsalt-api
|
||||
%endif
|
||||
|
||||
#
|
||||
@ -309,13 +321,14 @@ install -Dpm 0644 pkg/suse/salt.SuSEfirewall2 %{buildroot}%{_sysconfdir}/syscon
|
||||
#
|
||||
## install completion scripts
|
||||
%if %with_bashcomp
|
||||
install -Dpm 0644 pkg/salt.bash "%{buildroot}/etc/bash_completion.d/%{name}"
|
||||
install -Dpm 0644 pkg/salt.bash %{buildroot}/etc/bash_completion.d/%{name}
|
||||
install -Dpm 0644 scripts/completion/zsh_completion.zsh %{buildroot}/etc/zsh_completion.d/%{name}
|
||||
%endif #with_bashcomp
|
||||
|
||||
%check
|
||||
%if 0%{?suse_version} < 1310
|
||||
%{__python} setup.py test --runtests-opts=-u
|
||||
%endif
|
||||
#%%check
|
||||
#%%if 0%{?suse_version} < 1310
|
||||
#%%{__python} setup.py test --runtests-opts=-u
|
||||
#%%endif
|
||||
|
||||
%preun syndic
|
||||
%if 0%{?_unitdir:1}
|
||||
@ -401,6 +414,44 @@ install -Dpm 0644 pkg/salt.bash "%{buildroot}/etc/bash_completion.d/%{name}"
|
||||
%restart_on_update salt-minion
|
||||
%endif
|
||||
|
||||
%preun api
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_del_preun salt-api.service
|
||||
%else
|
||||
%stop_on_removal
|
||||
%endif
|
||||
|
||||
%pre api
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_add_pre salt-api.service
|
||||
%endif
|
||||
|
||||
%post api
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_add_post salt-api.service
|
||||
%else
|
||||
%fillup_and_insserv
|
||||
%endif
|
||||
|
||||
%postun api
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_del_postun salt-api.service
|
||||
%else
|
||||
%insserv_cleanup
|
||||
%restart_on_update
|
||||
%endif
|
||||
|
||||
%files api
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/salt-api
|
||||
%{_sbindir}/rcsalt-api
|
||||
%if 0%{?_unitdir:1}
|
||||
%_unitdir/salt-api.service
|
||||
%else
|
||||
%{_sysconfdir}/init.d/salt-api
|
||||
%endif
|
||||
%{_mandir}/man1/salt-api.1.*
|
||||
|
||||
%files cloud
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/salt-cloud
|
||||
@ -475,6 +526,8 @@ install -Dpm 0644 pkg/salt.bash "%{buildroot}/etc/bash_completion.d/%{name}"
|
||||
%dir %{_sysconfdir}/salt
|
||||
%dir /var/log/salt
|
||||
%{_bindir}/salt-call
|
||||
%{_bindir}/salt-unity
|
||||
%{_mandir}/man1/salt-unity.1.gz
|
||||
%{_mandir}/man1/salt-call.1.gz
|
||||
%{_mandir}/man7/salt.7.gz
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/salt
|
||||
@ -488,6 +541,10 @@ install -Dpm 0644 pkg/salt.bash "%{buildroot}/etc/bash_completion.d/%{name}"
|
||||
%defattr(-,root,root)
|
||||
%config %{_sysconfdir}/bash_completion.d/%{name}
|
||||
|
||||
%files zsh-completion
|
||||
%defattr(-,root,root)
|
||||
%config %{_sysconfdir}/zsh_completion.d/%{name}
|
||||
|
||||
%endif #with_bashcomp
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user