Merge pull request #380 from bareos/dev/pstorz/master/merge-ovirt-int…

…o-master-rebased Merge oVirt Plugin into master
bareos · Dec 18, 2019 · ef722e6 · ef722e6
2 parents 9fb23d9 + 207717c
commit ef722e6
Show file tree

Hide file tree

Showing 46 changed files with 2,715 additions and 22 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -30,6 +30,7 @@ Braian Bressan
 Bruno Friedmann
 Camilo Viecco
 Carlos A. Molina G
+Carlos Rodrigues
 Carsten Paeth
 Chris Lee
 Chris Matthews
@@ -133,6 +134,7 @@ Olivier Lehmann
 Paul Menzel
 Pavel Borecki
 Pavol Vrba
+Pedro Perdido
 Peter Buschmann
 Peter Eriksson
 Peter Kutak

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -694,8 +694,11 @@ if(${lmdb})
   set(LMDB_LIBS bareoslmdb)
 endif()
 
-# info what the config files need to be installed PLUGINS  ############
+# info what the config files need to be installed
+#####  PLUGINS  ############
 set(PLUGINS python-ldap-conf.d)
+list(APPEND PLUGINS python-ovirt-conf.d)
+
 if(${HAVE_CEPHFS})
   list(APPEND PLUGINS cephfs-conf.d)
 endif()

diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
@@ -568,6 +568,15 @@ Requires:   bareos-filedaemon = %{version}
 Requires:   bareos-filedaemon-python-plugin = %{version}
 Requires:   python-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}
+Requires:   python-pycurl
+Requires:   python-lxml
+Requires:   python-ovirt-engine-sdk4
+
 %package    storage-python-plugin
 Summary:    Python plugin for Bareos Storage daemon
 Group:      Productivity/Archiving/Backup
@@ -588,6 +597,11 @@ This package contains the python plugin for the file daemon
 
 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 storage-python-plugin
 %{dscr}
 
@@ -1366,6 +1380,13 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %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 director-python-plugin
 %defattr(-, root, root)
 %{plugin_dir}/python-dir.so