Change in vdsm[master]: vdsm.spec.in: with_gluster

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: vdsm.spec.in: with_gluster
......................................................................

vdsm.spec.in: with_gluster

Option to manage Gluster sub-package.

Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
---
M vdsm.spec.in
1 file changed, 19 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/13542/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index dbb9d04..9c14d64 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -17,6 +17,9 @@
 %global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
 %endif
 
+# Gluster
+%global with_gluster 1
+
 # Systemd macro
 %if 0%{?fedora} >= 15
 %global with_systemd 1
@@ -453,6 +456,7 @@
 %description hook-vmdisk
 Hook adds additional disk image for a VM (raw or qcow2)
 
+%if 0%{?with_gluster}
 %package gluster
 Summary:        Gluster Plugin for VDSM
 BuildArch:      noarch
@@ -465,6 +469,7 @@
 
 %description gluster
 Gluster plugin enables VDSM to serve Gluster functionalities.
+%endif
 
 %prep
 %setup -q
@@ -754,8 +759,12 @@
 %{_datadir}/%{vdsm_name}/storage/fileUtils.py*
 %{_datadir}/%{vdsm_name}/storage/fileVolume.py*
 %{_datadir}/%{vdsm_name}/storage/fuser.py*
+%if 0%{?with_gluster}
 %{_datadir}/%{vdsm_name}/storage/glusterSD.py*
 %{_datadir}/%{vdsm_name}/storage/glusterVolume.py*
+%else
+%exclude %{_datadir}/%{vdsm_name}/storage/gluster*
+%endif
 %{_datadir}/%{vdsm_name}/storage/hba.py*
 %{_datadir}/%{vdsm_name}/storage/hsm.py*
 %{_datadir}/%{vdsm_name}/storage/image.py*
@@ -833,11 +842,15 @@
 %{_datadir}/%{vdsm_name}/neterrors.py*
 %{_datadir}/%{vdsm_name}/respawn
 %{_datadir}/%{vdsm_name}/set-conf-item
+%if 0%{?with_gluster}
 %dir %{_datadir}/%{vdsm_name}/gluster
 %{_datadir}/%{vdsm_name}/gluster/__init__.py*
 %{_datadir}/%{vdsm_name}/gluster/cli.py*
 %{_datadir}/%{vdsm_name}/gluster/exception.py*
 %{_datadir}/%{vdsm_name}/gluster/hostname.py*
+%else
+%exclude %{_datadir}/%{vdsm_name}/gluster/*
+%endif
 %{python_sitelib}/sos/plugins/vdsm.py*
 /lib/udev/rules.d/12-vdsm-lvm.rules
 /etc/security/limits.d/99-vdsm.conf
@@ -912,8 +925,12 @@
 %{_datadir}/%{vdsm_name}/tests/route_info.out
 %{_datadir}/%{vdsm_name}/tests/route_info_ppc64.out
 %{_datadir}/%{vdsm_name}/tests/tc_filter_show.out
+%if 0%{?with_gluster}
 %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfo.xml
 %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfoNfs.xml
+%else
+%exclude %{_datadir}/%{vdsm_name}/tests/gluster*
+%endif
 %{_datadir}/%{vdsm_name}/tests/functional/*.py*
 
 %files hook-vhostmd
@@ -1101,11 +1118,13 @@
 %doc COPYING
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/10_faqemu
 
+%if 0%{?with_gluster}
 %files gluster
 %defattr(-, root, root, -)
 %dir %{_datadir}/%{vdsm_name}/gluster
 %doc COPYING
 %{_datadir}/%{vdsm_name}/gluster/api.py*
+%endif
 
 %changelog
 * Wed Oct 12 2011 Federico Simoncelli <fsimonce(a)redhat.com&gt; - 4.9.0-0


--
To view, visit http://gerrit.ovirt.org/13542
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: vdsm.spec.in: with_gluster
......................................................................


Patch Set 1: Looks good to me, approved

--
To view, visit http://gerrit.ovirt.org/13542
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Bala.FA <barumuga(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Vijay Bellur <vbellur(a)gmail.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: vdsm.spec.in: with_gluster
......................................................................


vdsm.spec.in: with_gluster

Option to manage Gluster sub-package.

Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
---
M vdsm.spec.in
1 file changed, 19 insertions(+), 0 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified
  Federico Simoncelli: Looks good to me, approved
  Dan Kenigsberg: 


--
To view, visit http://gerrit.ovirt.org/13542
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Bala.FA <barumuga(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Vijay Bellur <vbellur(a)gmail.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: vdsm.spec.in: with_gluster
......................................................................


Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1787/ (2/2)

--
To view, visit http://gerrit.ovirt.org/13542
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: vdsm.spec.in: with_gluster
......................................................................


Patch Set 1: Verified

--
To view, visit http://gerrit.ovirt.org/13542
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Bala.FA <barumuga(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Vijay Bellur <vbellur(a)gmail.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: vdsm.spec.in: with_gluster
......................................................................


Patch Set 1:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1787/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1838/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/13542
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Bala.FA <barumuga(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: vdsm.spec.in: with_gluster
......................................................................


Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1838/ (1/2)

--
To view, visit http://gerrit.ovirt.org/13542
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server