Skip to content

Commit

Permalink
Move the helper scripts into resalloc-helpers sub-package
Browse files Browse the repository at this point in the history
  • Loading branch information
praiskup committed Feb 28, 2024
1 parent 7dc56bd commit d822c83
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
11 changes: 11 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

New in v5.3:

* Changes:

- The helper scripts have been moved from resalloc-server to the
resalloc-helpers (sub)package. Cloud drivers that rely on those
scripts might be usable without the resalloc-server package and its
transitive dependencies.

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

New in v5.2:

* New Features
Expand Down
22 changes: 20 additions & 2 deletions rpm/resalloc.spec.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ Summary: %sum - server part
Requires: crontabs
Requires: logrotate
Requires: %default_python-%srcname = %version-%release
Requires: %srcname-helpers = %version-%release
%if %{with python3}
Requires: python3-alembic
Requires: python3-six
Expand All @@ -122,6 +123,17 @@ Requires(pre): /usr/sbin/useradd
The %name-server package provides the resalloc server, and
some tooling for resalloc administrators.


%package helpers
Summary: %sum - helper/library scripts

%description helpers
%desc

Helper and library-like scripts for external Resalloc plugins like resalloc-aws,
resalloc-openstack, etc.


%if %{with python3}
%package webui
Summary: %sum - webui part
Expand Down Expand Up @@ -323,8 +335,6 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
%{default_sitelib}/%{name}server
%{_bindir}/%{name}-server
%{_bindir}/%{name}-maint
%{_bindir}/%{name}-check-vm-ip
%{_bindir}/%{name}-wait-for-ssh
%attr(0750, %sysuser, %sysgroup) %dir %{_sysconfdir}/%{name}server
%config(noreplace) %{_sysconfdir}/%{name}server/*
%_unitdir/resalloc.service
Expand All @@ -336,6 +346,14 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
%_libexecdir/resalloc-merge-hook-logs
%config %attr(0755, root, root) %{_sysconfdir}/cron.hourly/resalloc


%files helpers
%doc %doc_files
%license COPYING
%{_bindir}/%{name}-check-vm-ip
%{_bindir}/%{name}-wait-for-ssh


%if %{with python3}
%files agent-spawner
%_bindir/resalloc-agent*
Expand Down

0 comments on commit d822c83

Please sign in to comment.