Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: vdsm reg: clean up
......................................................................
vdsm reg: clean up
Reviewing the vdsm spec found some remaning of vdsm reg deprecated
in early 3.6 versions.
Change-Id: I9f83b9e18ca24df4553e5b39e5b862759b9ac1b4
Signed-off-by: Douglas Schilling Landgraf <dougsl...@redhat.com>
---
M build-aux/Makefile.subs
M configure.ac
M vdsm.spec.in
M vdsm/sos/vdsm.py.in
4 files changed, 0 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/62463/1
diff --git a/build-aux/Makefile.subs b/build-aux/Makefile.subs
index 1d2849d..9819034 100644
--- a/build-aux/Makefile.subs
+++ b/build-aux/Makefile.subs
@@ -35,7 +35,6 @@
-e "s,[@]VDSMLOGDIR[@],$(vdsmlogdir),g" \
-e "s,[@]VDSMREPO[@],$(vdsmrepo),g" \
-e "s,[@]VDSMRUNDIR[@],$(vdsmrundir),g" \
- -e "s,[@]VDSMUPGRADEDIR[@],$(vdsmupgradedir),g"
CONFIGSUBST = $(top_builddir)/config.status --file=-
diff --git a/configure.ac b/configure.ac
index 7c3f85e..02770fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,13 +255,6 @@
AC_SUBST([configuratorsdir], ['${vdsmtooldir}/configurators'])
AC_SUBST([vdsmtestsdir], ['${datarootdir}/vdsm/tests'])
-# VDSM registration default paths
-AC_SUBST([vdsmregdir], ['${datarootdir}/vdsm-reg'])
-AC_SUBST([vdsmbootstrapdir], ['${datarootdir}/vdsm-bootstrap'])
-AC_SUBST([vdsmregconfdir], ['${sysconfdir}/vdsm-reg'])
-AC_SUBST([vdsmreglogdir], ['${localstatedir}/log/vdsm-reg'])
-AC_SUBST([vdsmupgradedir], ['/data/updates'])
-
# VDSM service
AC_SUBST([SERVICE_STOP_TIMEOUT], ['10'])
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 392b071..e65706b 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -324,18 +324,6 @@
%description yajsonrpc
A JSON RPC server and client implementation.
-%package reg
-Summary: VDSM registration package
-BuildArch: noarch
-Requires: %{name} = %{version}-%{release}
-Requires: m2crypto
-Requires: openssl
-Conflicts: ovirt-node < 3.0.4
-
-%description reg
-VDSM registration package. Used to register a Linux host to a Virtualization
-Manager.
-
%package python
Summary: VDSM python libraries
Requires: %{name}-api = %{version}-%{release}
diff --git a/vdsm/sos/vdsm.py.in b/vdsm/sos/vdsm.py.in
index 09ebb78..dd3ae91 100644
--- a/vdsm/sos/vdsm.py.in
+++ b/vdsm/sos/vdsm.py.in
@@ -103,10 +103,8 @@
self.addCopySpec("/tmp/vds_installer*")
self.addCopySpec("/tmp/vds_bootstrap*")
self.addCopySpec("/etc/vdsm/*")
- self.addCopySpec("/etc/vdsm-reg/*")
logsize = self.getOption('logsize')
self.__addCopySpecLogLimit("/var/log/vdsm/*", logsize)
- self.__addCopySpecLogLimit("/var/log/vdsm-reg/*", logsize)
self._addVdsmRunDir()
self.addCopySpec("@TRUSTSTORE@")
self.addCopySpec("@HOOKSDIR@")
--
To view, visit https://gerrit.ovirt.org/62463
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f83b9e18ca24df4553e5b39e5b862759b9ac1b4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsl...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
