Change in vdsm[master]: helpers: Move storage helpers to helpers/

nsoffer at redhat.com nsoffer at redhat.com
Wed May 11 21:16:05 UTC 2016


Nir Soffer has uploaded a new change for review.

Change subject: helpers: Move storage helpers to helpers/
......................................................................

helpers: Move storage helpers to helpers/

Another step in killing /usr/share/vdsm/storage - once all the sources
will move to site-packages/vdsm/storage, we can delete this directory.

Change-Id: I99010ecc2544fb2d5e145620dfc8f6e6a4daa7a9
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
M .gitignore
M configure.ac
M helpers/Makefile.am
R helpers/curl-img-wrap
R helpers/fc-scan
R helpers/spmprotect.sh.in
R helpers/spmstop.sh
M vdsm.spec.in
M vdsm/storage/Makefile.am
D vdsm/storage/protect/Makefile.am
10 files changed, 22 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/57363/1

diff --git a/.gitignore b/.gitignore
index 6ff6c76..a43faa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@
 init/systemd/vdsm-network.service
 init/systemd/mom-vdsm.service
 init/vdsmd_init_common.sh
+helpers/spmprotect.sh
 lib/api/vdsm-api.html
 lib/vdsm/config.py
 lib/vdsm/constants.py
@@ -60,7 +61,6 @@
 vdsm/storage/lvm.env
 vdsm/storage/vdsm-lvm.rules
 vdsm/storage/vdsm_lvm_rules.template
-vdsm/storage/protect/spmprotect.sh
 vdsm/sudoers.vdsm
 vdsm/svdsm.logger.conf
 vdsm/vdscli.py
diff --git a/configure.ac b/configure.ac
index 2168c6f..c655c01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,7 +420,6 @@
 	vdsm/supervdsm_api/Makefile
 	vdsm/storage/Makefile
 	vdsm/storage/imageRepository/Makefile
-	vdsm/storage/protect/Makefile
 	vdsm/storage/sdm/Makefile
 	vdsm/storage/sdm/api/Makefile
 	vdsm/storage/vdsm_lvm_rules.template
diff --git a/helpers/Makefile.am b/helpers/Makefile.am
index bf5bc76..cee86fc 100644
--- a/helpers/Makefile.am
+++ b/helpers/Makefile.am
@@ -9,5 +9,20 @@
 include $(top_srcdir)/build-aux/Makefile.subs
 
 dist_vdsmexec_SCRIPTS = \
+	curl-img-wrap \
+	fc-scan \
 	kvm2ovirt \
+	spmstop.sh \
+	$(NULL)
+
+nodist_vdsmexec_SCRIPTS = \
+	spmprotect.sh \
+	$(NULL)
+
+EXTRA_DIST = \
+	spmprotect.sh.in \
+	$(NULL)
+
+all-local: \
+	$(nodist_vdsm_SCRIPTS) \
 	$(NULL)
diff --git a/vdsm/storage/curl-img-wrap b/helpers/curl-img-wrap
similarity index 100%
rename from vdsm/storage/curl-img-wrap
rename to helpers/curl-img-wrap
diff --git a/vdsm/storage/fc-scan b/helpers/fc-scan
similarity index 100%
rename from vdsm/storage/fc-scan
rename to helpers/fc-scan
diff --git a/vdsm/storage/protect/spmprotect.sh.in b/helpers/spmprotect.sh.in
similarity index 100%
rename from vdsm/storage/protect/spmprotect.sh.in
rename to helpers/spmprotect.sh.in
diff --git a/vdsm/storage/protect/spmstop.sh b/helpers/spmstop.sh
similarity index 100%
rename from vdsm/storage/protect/spmstop.sh
rename to helpers/spmstop.sh
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 07daaf3..a0ad0f2 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -974,12 +974,14 @@
 %{_sysconfdir}/libvirt/hooks/qemu
 %{_libexecdir}/%{vdsm_name}/curl-img-wrap
 %{_libexecdir}/%{vdsm_name}/fc-scan
-%{_libexecdir}/%{vdsm_name}/persist-vdsm-hooks
-%{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook
+%{_libexecdir}/%{vdsm_name}/kvm2ovirt
 %{_libexecdir}/%{vdsm_name}/ovirt_functions.sh
+%{_libexecdir}/%{vdsm_name}/persist-vdsm-hooks
+%{_libexecdir}/%{vdsm_name}/spmprotect.sh
+%{_libexecdir}/%{vdsm_name}/spmstop.sh
+%{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook
 %{_libexecdir}/%{vdsm_name}/vdsm-gencerts.sh
 %{_libexecdir}/%{vdsm_name}/vdsmd_init_common.sh
-%{_libexecdir}/%{vdsm_name}/kvm2ovirt
 %{_libexecdir}/%{vdsm_name}/wait_for_ipv4s
 %{_datadir}/%{vdsm_name}/supervdsm_api/__init__.py*
 %{_datadir}/%{vdsm_name}/supervdsm_api/hwinfo.py*
@@ -1035,8 +1037,6 @@
 %{_datadir}/%{vdsm_name}/storage/sdm/api/__init__.py*
 %{_datadir}/%{vdsm_name}/storage/sdm/api/base.py*
 %{_datadir}/%{vdsm_name}/storage/sdm/api/create_volume.py*
-%{_libexecdir}/%{vdsm_name}/spmprotect.sh
-%{_libexecdir}/%{vdsm_name}/spmstop.sh
 %dir %{_libexecdir}/%{vdsm_name}/hooks
 %dir %{_libexecdir}/%{vdsm_name}/hooks/before_device_create
 %dir %{_libexecdir}/%{vdsm_name}/hooks/after_device_create
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index cad6053..7226a41 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -18,7 +18,7 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
-SUBDIRS = protect imageRepository sdm
+SUBDIRS = imageRepository sdm
 
 include $(top_srcdir)/build-aux/Makefile.subs
 
@@ -63,11 +63,6 @@
 	threadLocal.py \
 	threadPool.py \
 	volume.py
-
-dist_vdsmexec_SCRIPTS = \
-	curl-img-wrap \
-	fc-scan \
-	$(NULL)
 
 nodist_vdsmstorage_DATA = \
 	lvm.env \
diff --git a/vdsm/storage/protect/Makefile.am b/vdsm/storage/protect/Makefile.am
deleted file mode 100644
index 24b7205..0000000
--- a/vdsm/storage/protect/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2008 Red Hat, Inc. and/or its affiliates.
-#
-# Licensed to you under the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.  See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
-#
-
-include $(top_srcdir)/build-aux/Makefile.subs
-
-dist_vdsmexec_SCRIPTS = \
-	spmstop.sh \
-	$(NULL)
-
-nodist_vdsmexec_SCRIPTS = \
-	spmprotect.sh \
-	$(NULL)
-
-EXTRA_DIST = \
-	spmprotect.sh.in \
-	$(NULL)
-
-all-local: \
-	$(nodist_vdsm_SCRIPTS) \
-	$(NULL)


-- 
To view, visit https://gerrit.ovirt.org/57363
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99010ecc2544fb2d5e145620dfc8f6e6a4daa7a9
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>


More information about the vdsm-patches mailing list