Change in vdsm[master]: spec: use the fedora systemd macros

[Federico Simoncelli]

Federico Simoncelli has uploaded a new change for review.

Change subject: spec: use the fedora systemd macros
......................................................................

spec: use the fedora systemd macros

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=850412
Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Signed-off-by: Federico Simoncelli 
---
M vdsm.spec.in
1 file changed, 12 insertions(+), 0 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/12285/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 38838ea..e9289a7 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -528,12 +528,16 @@
     /sbin/chkconfig --add vdsm-restore-net-config
 fi
 %else
+%if 0%{?fedora} >= 18
+%systemd_post vdsmd.service
+%else
 if [ "$1" -eq 1 ] ; then
     /bin/systemctl enable vdsmd.service >/dev/null 2>&1 || :
     /bin/systemctl enable vdsm-restore-net-config.service >/dev/null 2>&1 || :
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 exit 0
+%endif
 %endif

%preun
@@ -574,12 +578,16 @@
     fi
 fi
 %else
+%if 0%{?fedora} >= 18
+%systemd_preun vdsmd.service
+%else
 if [ "$1" -eq 0 ]; then
     /bin/systemctl --no-reload disable vdsmd.service > /dev/null 2>&1 || :
     /bin/systemctl --no-reload disable vdsm-restore-net-config.service > /dev/null 2>&1 || :
     /bin/systemctl stop vdsmd.service > /dev/null 2>&1 || :
 fi
 exit 0
+%endif
 %endif

%postun
@@ -589,11 +597,15 @@
 fi
 exit 0
 %else
+%if 0%{?fedora} >= 18
+%systemd_postun_with_restart vdsmd.service
+%else
 if [ "$1" -ge 1 ] ; then
     /bin/systemctl try-restart vdsmd.service >/dev/null 2>&1 || :
 fi
 exit 0
 %endif
+%endif

%if 0%{?rhel}
 %triggerun -- libvirt

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 1:

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/475/ (3/3)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1366/ (1/3)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 1:

Build Successful

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

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/475/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 1: I would prefer that you didn't submit this

Federico, do you mind to rebase your patch based on the new macro "with_systemd" ? It's not only Fedora >=15 which uses systemd, RHEL7 as well.

Here the patch: http://gerrit.ovirt.org/#/c/12086/

Thanks!

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 1:
> Federico, do you mind to rebase your patch based on the new macro "with_systemd" ? It's not only Fedora >=15 which uses systemd, RHEL7 as well.

According to bz850412 these (new) systemd macros were introduced in fedora 18+. Relying on with_systemd would be wrong for fedora 15-17.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 1: No score

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 1: Looks good to me, but someone else must approve

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: oVirt Jenkins CI Server

Mark Wu has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 1: I would prefer that you didn't submit this

(1 inline comment)

....................................................
File vdsm.spec.in
Line 532: %systemd_post vdsmd.service
Line 533: %else
Line 534: if [ "$1" -eq 1 ] ; then
Line 535:     /bin/systemctl enable vdsmd.service >/dev/null 2>&1 || :
Line 536:     /bin/systemctl enable vdsm-restore-net-config.service >/dev/null 2>&1 || :
any reason not enable vdsm-restore-net-config.service by default?
Line 537:     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
Line 538: fi
Line 539: exit 0
Line 540: %endif

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 2:

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 2:

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 2:

Build Successful

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

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 3:

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 3:

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 3:

Build Successful

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

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 3: Looks good to me, but someone else must approve

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 4:

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 4:

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 4: Verified

Verified: in fedora >= 18 the systemd macros are used.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 4: Fails

Build Failed

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1961/ : FAILURE

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: spec: use the fedora systemd macros
......................................................................

Patch Set 4: Looks good to me, approved

raising Douglas's

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: spec: use the fedora systemd macros
......................................................................

spec: use the fedora systemd macros

Add the support for the fedora systemd macros introduced in fedora 18.

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=850412
Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Signed-off-by: Federico Simoncelli 
---
M vdsm.spec.in
1 file changed, 26 insertions(+), 5 deletions(-)

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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Mark Wu