From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: place sos plugin under lib
......................................................................
place sos plugin under lib
Change-Id: Ide3f93d8d737e6e3b86c04e3751ef9bc8f774b09
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M .gitignore
M configure.ac
M lib/Makefile.am
R lib/sos/Makefile.am
R lib/sos/vdsm.py.in
M vdsm/Makefile.am
6 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/78586/1
diff --git a/.gitignore b/.gitignore
index 7251e4f..55117bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@
lib/vdsm/config.py
lib/vdsm/constants.py
lib/vdsm/dsaversion.py
+lib/vdsm/sos/vdsm.py
lib/vdsm/storage/lvm.env
lib/vdsm/storage/protect/spmprotect.sh
lib/vdsm/storage/vdsm-lvm.rules
@@ -71,10 +72,8 @@
tests/other.key
vdsm-*.tar.gz
vdsm.spec
-vdsm/sos/vdsm.py
vdsm/vdscli.py
vdsm/vdsm-gencerts.sh
-vdsm/vdsm-sosplugin.py
static/usr/share/man/man1/vdsm-tool.1
static/usr/share/man/man8/vdsmd.8
vdsm/rpc/vdsm-api.html
diff --git a/configure.ac b/configure.ac
index d65324f..8cad1ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -373,6 +373,7 @@
init/Makefile
init/systemd/Makefile
lib/Makefile
+ lib/sos/Makefile
lib/vdsm/Makefile
lib/vdsm/api/Makefile
lib/vdsm/common/Makefile
@@ -429,7 +430,6 @@
tests/storage/Makefile
tests/virttests/Makefile
vdsm/Makefile
- vdsm/sos/Makefile
vdsm/virt/Makefile
vdsm_hooks/Makefile
vdsm_hooks/allocate_net/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5197896..ed18725 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,4 +19,4 @@
#
include $(top_srcdir)/build-aux/Makefile.subs
-SUBDIRS = vdsm vdsmclient yajsonrpc
+SUBDIRS = sos vdsm vdsmclient yajsonrpc
diff --git a/vdsm/sos/Makefile.am b/lib/sos/Makefile.am
similarity index 100%
rename from vdsm/sos/Makefile.am
rename to lib/sos/Makefile.am
diff --git a/vdsm/sos/vdsm.py.in b/lib/sos/vdsm.py.in
similarity index 100%
rename from vdsm/sos/vdsm.py.in
rename to lib/sos/vdsm.py.in
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index abeaf62..2fe9f54 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -18,7 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
-SUBDIRS = sos virt
+SUBDIRS = virt
include $(top_srcdir)/build-aux/Makefile.subs
--
To view, visit
https://gerrit.ovirt.org/78586
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide3f93d8d737e6e3b86c04e3751ef9bc8f774b09
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>