3:15 a.m.
Mark Wu has uploaded a new change for review.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
spec: fix that vdsmd.service is not enabled after installation
For fedora18+, we use the helper macro to replace the manual systemd
scriptlets. But for post installation, %systemd_post is expanded as
below:
/usr/bin/systemctl preset vdsmd.service >/dev/null 2>&1 || :
So vdsm service will be disabled after installation because the default
systemd preset setting disable all services which are not explictly
enabled in the configuration files.
We can ship a preset configuration file to enable vdsmd service, but
reverting to manual systemd scriptlets is simpler and doesn't lose any
benefit.
Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
---
M vdsm.spec.in
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/16754/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 560e01a..7ab96ea 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -634,11 +634,6 @@
/sbin/chkconfig --add vdsm-restore-net-config
fi
%else
-%if 0%{?with_systemd_macros}
-%systemd_post vdsmd.service
-%systemd_post supervdsmd.service
-%systemd_post vdsm-restore-net-config.service
-%else
if [ "$1" -eq 1 ] ; then
/bin/systemctl enable vdsmd.service >/dev/null 2>&1 || :
/bin/systemctl enable supervdsmd.service >/dev/null 2>&1 || :
@@ -646,7 +641,6 @@
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
exit 0
-%endif
%endif
%preun
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
7:07 a.m.
Zhou Zheng Sheng has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 3:
Get it, thanks!
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
5:35 a.m.
Dan Kenigsberg has submitted this change and it was merged.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
spec: fix that vdsmd.service is not enabled after installation
For fedora18+, we use the helper macro to replace the manual systemd
scriptlets. But for post installation, %systemd_post is expanded as
below:
/usr/bin/systemctl preset vdsmd.service >/dev/null 2>&1 || :
So vdsm service will be disabled after installation because the default
systemd preset setting disable all services which are not explictly
enabled in the configuration files.
We can ship a preset configuration file to enable vdsmd service, but
reverting to manual systemd scriptlets is simpler and doesn't lose any
benefit.
Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Reviewed-on: http://gerrit.ovirt.org/16754
Reviewed-by: Antoni Segura Puimedon <asegurap(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Antoni Segura Puimedon: Looks good to me, but someone else must approve
Mark Wu: Verified
Dan Kenigsberg: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
5:35 a.m.
Dan Kenigsberg has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 2: Looks good to me, approved
IMO it's too important to have this is ovirt-3.3, hence I am not waiting longer to
Zhou's explanation. We could take a purer systemd approach in ovirt-3.4.
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
9:22 a.m.
Antoni Segura Puimedon has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 2: Looks good to me, but someone else must approve
@Zhou: http://www.freedesktop.org/software/systemd/man/systemd.preset.html states that
presets should not be provided by the package providing the units, but rather as part of
policy packages that normally are part of distro spins. Thus, for now, I think the current
patch approach is a good solution.
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11:07 p.m.
Dan Kenigsberg has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 2: Looks good to me, but someone else must approve
Zhou, I do not understand your worries. We must not start any service during rpm
installation, but we should make sure it is enabled.
Please use -1 if we should not take this patch iyo.
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
2:27 a.m.
Zhou Zheng Sheng has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 2:
Both systemctl commands and systemd preset don't start vdsmd service in post-install
scripts. I think most of the services are started by the user manually after installation,
or automatically started after reboot.
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
2:21 a.m.
Mark Wu has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 2:
But 'systemctl preset' just enable or disable the service according to the preset
policy. If we want to actually start the service, we still need to run systemctl start
vdsmd.service in post install.
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
9:17 p.m.
Zhou Zheng Sheng has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 2:
Hmm.. I think adding a 80-vdsm.preset to /usr/lib/systemd/system-preset is long term
solution..
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
4:56 a.m.
Mark Wu has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 2: Verified
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
4:19 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/2501/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/3311/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/3391/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
3:20 a.m.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/2460/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/3270/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/3350/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
3:17 a.m.
Mark Wu has posted comments on this change.
Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................
Patch Set 1: Verified
--
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
3951
days inactive
3965
days old
vdsm-patches@lists.fedorahosted.org
12 comments
5 participants
participants (5)
-
asegurap＠redhat.com -
Dan Kenigsberg -
Jenkins CI RO -
wudxw＠linux.vnet.ibm.com -
zhshzhou＠linux.vnet.ibm.com