Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

filedaemon: remove ovirt plugin #1617

Merged
merged 5 commits into from Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- dird: remove optimize_for_size/optimize_for_speed [PR #1612]
- build: introduce Fedora 39 [PR #1614]
- libcloud: modularize systemtest [PR #1609]
- filedaemon: remove ovirt plugin [PR #1617]

### Removed
- plugins: remove old deprecated postgres plugin [PR #1606]
Expand All @@ -31,4 +32,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[PR #1609]: https://github.com/bareos/bareos/pull/1609
[PR #1612]: https://github.com/bareos/bareos/pull/1612
[PR #1614]: https://github.com/bareos/bareos/pull/1614
[PR #1617]: https://github.com/bareos/bareos/pull/1617
[unreleased]: https://github.com/bareos/bareos/tree/master
2 changes: 0 additions & 2 deletions core/CMakeLists.txt
Expand Up @@ -724,8 +724,6 @@ endif()
# info what the config files need to be installed PLUGINS ############
set(PLUGINS python-ldap)

list(APPEND PLUGINS python-ovirt)

if(VIXDISKLIB_FOUND)
list(APPEND PLUGINS python-vmware)
endif()
Expand Down
20 changes: 0 additions & 20 deletions core/platforms/packaging/bareos.spec
Expand Up @@ -447,14 +447,6 @@ Suggests: bareos-filedaemon-python3-plugin = %{version}
%endif
Requires: python3-ldap

%package filedaemon-ovirt-python-plugin
Summary: Ovirt Python plugin for Bareos File daemon
Group: Productivity/Archiving/Backup
Requires: bareos-filedaemon = %{version}
Requires: bareos-filedaemon-python-plugin = %{version}
%if 0%{?rhel} != 7
Suggests: bareos-filedaemon-python3-plugin = %{version}
%endif

%package filedaemon-libcloud-python-plugin
Summary: Libcloud Python plugin for Bareos File daemon
Expand Down Expand Up @@ -573,11 +565,6 @@ This package contains the common files for the python filedaemon plugins.

This package contains the LDAP python plugin for the file daemon

%description filedaemon-ovirt-python-plugin
%{dscr}

This package contains the Ovirt python plugin for the file daemon

%description filedaemon-libcloud-python-plugin
%{dscr}

Expand Down Expand Up @@ -1463,13 +1450,6 @@ mkdir -p %{?buildroot}/%{_libdir}/bareos/plugins/vmware_plugin
%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/backup-ldap.conf.example
%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/restore-ldap.conf.example

%files filedaemon-ovirt-python-plugin
%defattr(-, root, root)
%{plugin_dir}/bareos-fd-ovirt.py*
%{plugin_dir}/BareosFdPluginOvirt.py*
%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/fileset/plugin-ovirt.conf.example
%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/backup-ovirt.conf.example

%files filedaemon-libcloud-python-plugin
%defattr(-, root, root)
%{plugin_dir}/bareos-fd-libcloud.py*
Expand Down
2 changes: 0 additions & 2 deletions core/src/plugins/filed/python/CMakeLists.txt
Expand Up @@ -122,8 +122,6 @@ set(PYFILES
pyfiles/bareos-fd-local-fileset.py
ldap/bareos-fd-ldap.py
mariabackup/bareos-fd-mariabackup.py
ovirt/bareos-fd-ovirt.py
ovirt/BareosFdPluginOvirt.py
percona-xtrabackup/bareos-fd-percona-xtrabackup.py
postgresql/bareos-fd-postgresql.py
vmware/bareos-fd-vmware.py
Expand Down