From 17caaa59af64cbc3da06d1e9ea4f3d02c9d8e0b6 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Thu, 5 Sep 2024 01:44:16 +0300 Subject: [PATCH] vitastor-opennebula is probably more correct than opennebula-vitastor --- debian/control | 2 +- ...bula-vitastor.install => vitastor-opennebula.install} | 0 ...la-vitastor.postinst => vitastor-opennebula.postinst} | 0 ...la-vitastor.triggers => vitastor-opennebula.triggers} | 0 docs/installation/opennebula.en.md | 6 ++++-- docs/installation/opennebula.ru.md | 6 ++++-- rpm/vitastor-el7.spec | 9 +++++---- rpm/vitastor-el8.spec | 9 +++++---- rpm/vitastor-el9.spec | 9 +++++---- 9 files changed, 24 insertions(+), 17 deletions(-) rename debian/{opennebula-vitastor.install => vitastor-opennebula.install} (100%) rename debian/{opennebula-vitastor.postinst => vitastor-opennebula.postinst} (100%) rename debian/{opennebula-vitastor.triggers => vitastor-opennebula.triggers} (100%) diff --git a/debian/control b/debian/control index 97802837..6834554c 100644 --- a/debian/control +++ b/debian/control @@ -54,7 +54,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client (= ${binary:Version Description: Vitastor Proxmox Virtual Environment storage plugin Vitastor storage plugin for Proxmox Virtual Environment. -Package: opennebula-vitastor +Package: vitastor-opennebula Architecture: amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client, patch, python3, jq Description: Vitastor OpenNebula storage plugin diff --git a/debian/opennebula-vitastor.install b/debian/vitastor-opennebula.install similarity index 100% rename from debian/opennebula-vitastor.install rename to debian/vitastor-opennebula.install diff --git a/debian/opennebula-vitastor.postinst b/debian/vitastor-opennebula.postinst similarity index 100% rename from debian/opennebula-vitastor.postinst rename to debian/vitastor-opennebula.postinst diff --git a/debian/opennebula-vitastor.triggers b/debian/vitastor-opennebula.triggers similarity index 100% rename from debian/opennebula-vitastor.triggers rename to debian/vitastor-opennebula.triggers diff --git a/docs/installation/opennebula.en.md b/docs/installation/opennebula.en.md index dfa734a3..be9a52e0 100644 --- a/docs/installation/opennebula.en.md +++ b/docs/installation/opennebula.en.md @@ -6,11 +6,13 @@ ## Automatic Installation -OpenNebula plugin is packaged as `opennebula-vitastor` Debian and RPM package since Vitastor 1.9.0. So: +OpenNebula plugin is packaged as `vitastor-opennebula` Debian and RPM package since Vitastor 1.9.0. So: -- Run `apt-get install opennebula-vitastor` or `yum install vitastor` after installing OpenNebula on all nodes +- Run `apt-get install vitastor-opennebula` or `yum install vitastor-opennebula` after installing OpenNebula on all nodes - Check that it prints "OK, Vitastor OpenNebula patches successfully applied" or "OK, Vitastor OpenNebula patches are already applied" - If it does not, refer to [Manual Installation](#manual-installation) and apply configuration file changes manually +- Make sure that Vitastor patched versions of QEMU and libvirt are installed + (`dpkg -l qemu-system-x86`, `dpkg -l | grep libvirt`, `rpm -qa | grep qemu`, `rpm -qa | grep qemu`, `rpm -qa | grep libvirt-libs` should show "vitastor" in version names) - [Block VM access to Vitastor cluster](#block-vm-access-to-vitastor-cluster) ## Manual Installation diff --git a/docs/installation/opennebula.ru.md b/docs/installation/opennebula.ru.md index 41f5f03d..33bcb171 100644 --- a/docs/installation/opennebula.ru.md +++ b/docs/installation/opennebula.ru.md @@ -6,11 +6,13 @@ ## Автоматическая установка -Плагин OpenNebula Vitastor распространяется как Debian и RPM пакет `opennebula-vitastor`, начиная с версии Vitastor 1.9.0. Так что: +Плагин OpenNebula Vitastor распространяется как Debian и RPM пакет `vitastor-opennebula`, начиная с версии Vitastor 1.9.0. Так что: -- Запустите `apt-get install opennebula-vitastor` или `yum install vitastor` после установки OpenNebula на всех серверах +- Запустите `apt-get install vitastor-opennebula` или `yum install vitastor-opennebula` после установки OpenNebula на всех серверах - Проверьте, что он выводит "OK, Vitastor OpenNebula patches successfully applied" или "OK, Vitastor OpenNebula patches are already applied" в процессе установки - Если сообщение не выведено, пройдите по шагам инструкцию [Ручная установка](#ручная-установка) и примените правки файлов конфигурации вручную +- Удостоверьтесь, что установлены версии QEMU и libvirt с изменениями Vitastor + (`dpkg -l qemu-system-x86`, `dpkg -l | grep libvirt`, `rpm -qa | grep qemu`, `rpm -qa | grep qemu`, `rpm -qa | grep libvirt-libs` должны показывать "vitastor" в номере версии) - [Заблокируйте доступ виртуальных машин в Vitastor](#блокировка-доступа-вм-в-vitastor) ## Ручная установка diff --git a/rpm/vitastor-el7.spec b/rpm/vitastor-el7.spec index 8b971c64..03e1ea15 100644 --- a/rpm/vitastor-el7.spec +++ b/rpm/vitastor-el7.spec @@ -89,16 +89,17 @@ Requires: fio = 3.7-1.el7 Vitastor fio drivers for benchmarking. -%package -n opennebula-vitastor +%package -n vitastor-opennebula Summary: Vitastor for OpenNebula Group: Development/Libraries Requires: vitastor-client Requires: jq Requires: python3-lxml Requires: patch +Requires: qemu-kvm-block-vitastor -%description -n opennebula-vitastor +%description -n vitastor-opennebula Vitastor storage plugin for OpenNebula. @@ -191,12 +192,12 @@ chown vitastor:vitastor /var/lib/vitastor %_libdir/libfio_vitastor_sec.so -%files -n opennebula-vitastor +%files -n vitastor-opennebula /var/lib/one /etc/sudoers.d/opennebula-vitastor -%triggerin -n opennebula-vitastor -- opennebula +%triggerin -n vitastor-opennebula -- opennebula [ $2 = 0 ] || exit 0 /var/lib/one/remotes/datastore/vitastor/install.sh diff --git a/rpm/vitastor-el8.spec b/rpm/vitastor-el8.spec index f6dc559d..d43f3993 100644 --- a/rpm/vitastor-el8.spec +++ b/rpm/vitastor-el8.spec @@ -87,16 +87,17 @@ Requires: fio = 3.7-3.el8 Vitastor fio drivers for benchmarking. -%package -n opennebula-vitastor +%package -n vitastor-opennebula Summary: Vitastor for OpenNebula Group: Development/Libraries Requires: vitastor-client Requires: jq Requires: python3-lxml Requires: patch +Requires: qemu-kvm-block-vitastor -%description -n opennebula-vitastor +%description -n vitastor-opennebula Vitastor storage plugin for OpenNebula. @@ -188,12 +189,12 @@ chown vitastor:vitastor /var/lib/vitastor %_libdir/libfio_vitastor_sec.so -%files -n opennebula-vitastor +%files -n vitastor-opennebula /var/lib/one /etc/sudoers.d/opennebula-vitastor -%triggerin -n opennebula-vitastor -- opennebula +%triggerin -n vitastor-opennebula -- opennebula [ $2 = 0 ] || exit 0 /var/lib/one/remotes/datastore/vitastor/install.sh diff --git a/rpm/vitastor-el9.spec b/rpm/vitastor-el9.spec index 49266e08..4e6e6365 100644 --- a/rpm/vitastor-el9.spec +++ b/rpm/vitastor-el9.spec @@ -81,16 +81,17 @@ Requires: fio = 3.27-8.el9 Vitastor fio drivers for benchmarking. -%package -n opennebula-vitastor +%package -n vitastor-opennebula Summary: Vitastor for OpenNebula Group: Development/Libraries Requires: vitastor-client Requires: jq Requires: python3-lxml Requires: patch +Requires: qemu-kvm-block-vitastor -%description -n opennebula-vitastor +%description -n vitastor-opennebula Vitastor storage plugin for OpenNebula. @@ -181,12 +182,12 @@ chown vitastor:vitastor /var/lib/vitastor %_libdir/libfio_vitastor_sec.so -%files -n opennebula-vitastor +%files -n vitastor-opennebula /var/lib/one /etc/sudoers.d/opennebula-vitastor -%triggerin -n opennebula-vitastor -- opennebula +%triggerin -n vitastor-opennebula -- opennebula [ $2 = 0 ] || exit 0 /var/lib/one/remotes/datastore/vitastor/install.sh