Douglas Schilling Landgraf has uploaded a new change for review. Change subject: Revert "spec: start/enable glusterd" ......................................................................
Revert "spec: start/enable glusterd" This reverts commit 1701ecc3b9d9573da41f66a7e5a493a1317d03db. Should be done via cluster level. Change-Id: I32fb3247213cc99484a442e4df91910bd196695e Signed-off-by: Douglas Schilling Landgraf <[email protected]> --- M ovirt-node-plugin-vdsm.spec.in 1 file changed, 1 insertion(+), 37 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node-plugin-vdsm refs/changes/16/26416/1 diff --git a/ovirt-node-plugin-vdsm.spec.in b/ovirt-node-plugin-vdsm.spec.in index 509d280..8e81339 100644 --- a/ovirt-node-plugin-vdsm.spec.in +++ b/ovirt-node-plugin-vdsm.spec.in @@ -1,13 +1,5 @@ %define is_f19 %(test "0%{?fedora}" -eq "019" && echo 1 || echo 0) -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6 -%global with_gluster 1 -%endif - -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 -%global with_systemd 1 -%endif - Summary: A plugin to make oVirt Node installs compatible with oVirt Engine and vdsm Name: ovirt-node-plugin-vdsm Version: @VERSION@ @@ -30,10 +22,6 @@ BuildArch: noarch BuildRequires: python2-devel - -%if 0%{?with_gluster} -Requires: glusterfs-server -%endif %define app_root %{_datadir}/%{name} %define recipe_root %{_datadir}/ovirt-node-recipe @@ -62,17 +50,6 @@ make install DESTDIR=%{buildroot} %post -if [ $1 -eq 1 ]; then -%if 0%{?with_gluster} -%if ! 0%{?with_systemd} - service glusterd start >/dev/null 2>&1 || : - chkconfig --add glusterd >/dev/null 2>&1 || : -%else - systemctl start glusterd.service >/dev/null 2>&1 || : - systemctl enable glusterd.service >/dev/null 2>&1 || : -%endif -%endif - # semanage is not present in the image and virt_use_nfs is on (see rhbz#642209) # remove it from vdsmd startup script to avoid error sed -i 's#/usr/sbin/semanage#/bin/true#' /etc/rc.d/init.d/vdsmd @@ -88,7 +65,7 @@ set /files/etc/sysctl.conf/net.ipv4.ip_local_reserved_ports 54321 save EOF_sysctl -fi + #SELinux Booleans /usr/sbin/setsebool -P virt_use_nfs=1 \ virt_use_sanlock=1 \ @@ -100,19 +77,6 @@ %endif %preun - -%postun -if [ $1 -eq 0 ]; then -%if 0%{?with_gluster} -%if ! 0%{?with_systemd} - service glusterd stop >/dev/null 2>&1 || : - chkconfig --del glusterd >/dev/null 2>&1 || : -%else - systemctl stop glusterd.service >/dev/null 2>&1 || : - systemctl disable glusterd.service >/dev/null 2>&1 || : -%endif -%endif -fi %files recipe %{recipe_root} -- To view, visit http://gerrit.ovirt.org/26416 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32fb3247213cc99484a442e4df91910bd196695e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node-plugin-vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
