Yaniv Bronhaim has uploaded a new change for review.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Removing vdsm configuration when removing vdsm service
Before we removed that section only over rhel and we looked for the wrong string. This patch adds sed command for both dist with the current string that is written by vdsmd init script.
Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=902346 Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com --- M vdsm.spec.in 1 file changed, 10 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/11295/1
diff --git a/vdsm.spec.in b/vdsm.spec.in index 632d315..42dfca4 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -514,17 +514,21 @@ %endif
%preun +start_conf_section="## beginning of configuration section by vdsm" +end_conf_section="## end of configuration section by vdsm" + +# Removing vdsm configuration from libvirtd.conf and qemu.conf +/bin/sed -i "/${start_conf_section}/,/${end_conf_section}/d" \ + /etc/libvirt/libvirtd.conf \ + /etc/libvirt/qemu.conf \ + /etc/sysconfig/libvirtd \ + /etc/sysctl.conf + %if 0%{?rhel} if [ "$1" -eq 0 ] then /sbin/service vdsmd stop > /dev/null 2>&1 || : /sbin/chkconfig --del vdsmd - - /bin/sed -i '/# by vdsm$/d' \ - /etc/libvirt/libvirtd.conf \ - /etc/libvirt/qemu.conf \ - /etc/sysconfig/libvirtd \ - /etc/sysctl.conf
/bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \ /etc/sysctl.conf
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/870/ (3/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/13/ (2/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/905/ (1/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 1: Fails
Build Failed
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/870/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/905/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/13/ : FAILURE
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Yaniv Bronhaim has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 1: Verified
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Douglas Schilling Landgraf has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 1:
I would support removing both vdsm conf styles, the new and old one, here an example from vdsmd.init.in
remove_vdsm_conf() { sed -i --copy -e "/${start_conf_section}/,/${end_conf_section}/d" \ -e "/$by_vdsm/d" "$@" }
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Yaniv Bronhaim has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 1:
I know that part, and it uses that to rewrite the configuration when you reconfigure libvirt using vdsmd service script. It doesn't related to the part I added in this patch that runs each removal of vdsm rpm.
I don't understand what you suggest to remove..
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Douglas Schilling Landgraf has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 1: Looks good to me, but someone else must approve
I was sharing that we could remove old and new vdsm conf style in the same sed line, it doesn't hurt anyway... but since this rpm just use the new style, it's enough.
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Royce Lv has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 1: I would prefer that you didn't submit this
(2 inline comments)
.................................................... File vdsm.spec.in Line 520: # Removing vdsm configuration from libvirtd.conf and qemu.conf Line 521: /bin/sed -i "/${start_conf_section}/,/${end_conf_section}/d" \ Line 522: /etc/libvirt/libvirtd.conf \ Line 523: /etc/libvirt/qemu.conf \ Line 524: /etc/sysconfig/libvirtd \ And also /etc/libvirt/qemu-sanlock.conf needs to be cleaned. What about use MACRO instead of file paths? Line 525: /etc/sysctl.conf Line 526: Line 527: %if 0%{?rhel} Line 528: if [ "$1" -eq 0 ]
Line 530: /sbin/service vdsmd stop > /dev/null 2>&1 || : Line 531: /sbin/chkconfig --del vdsmd Line 532: Line 533: /bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \ Line 534: /etc/sysctl.conf I think this line needs to be deleted, they have been done by Line 494-Line499 Line 535: Line 536: %{_bindir}/vdsm-tool sebool-unconfig || : Line 537: Line 538: /usr/sbin/saslpasswd2 -p -a libvirt -d vdsm@ovirt
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1170/ (2/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/316/ (1/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1205/ (3/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1170/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1205/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/316/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 3:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1171/ (2/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 3:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1206/ (3/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 3:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/317/ (1/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 3:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1171/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1206/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/317/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Yaniv Bronhaim has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 1: (1 inline comment)
.................................................... File vdsm.spec.in Line 530: /sbin/service vdsmd stop > /dev/null 2>&1 || : Line 531: /sbin/chkconfig --del vdsmd Line 532: Line 533: /bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \ Line 534: /etc/sysctl.conf line 496 is in %post section which runs during installations. here we're in %preun which runs during removal of the rpm Line 535: Line 536: %{_bindir}/vdsm-tool sebool-unconfig || : Line 537: Line 538: /usr/sbin/saslpasswd2 -p -a libvirt -d vdsm@ovirt
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Yaniv Bronhaim has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 3: Verified
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Douglas Schilling Landgraf has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 3: Looks good to me, but someone else must approve
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 3: I would prefer that you didn't submit this
(2 inline comments)
.................................................... File vdsm.spec.in Line 519: exit 0 Line 520: %endif Line 521: Line 522: %preun Line 523: start_conf_section="## beginning of configuration section by vdsm" this should be done only
if [ "$1" -eq 0 ]
and not during upgrade!
I think you should also keep supporting older code, where we had "by vdsm" ending each line. (please check which versions of vdsm had that) Line 524: end_conf_section="## end of configuration section by vdsm" Line 525: Line 526: # Removing vdsm configuration from libvirtd.conf and qemu.conf Line 527: /bin/sed -i "/${start_conf_section}/,/${end_conf_section}/d" \
Line 522: %preun Line 523: start_conf_section="## beginning of configuration section by vdsm" Line 524: end_conf_section="## end of configuration section by vdsm" Line 525: Line 526: # Removing vdsm configuration from libvirtd.conf and qemu.conf I love comments, but I do not think that this one adds anything to the code. It's not even exact (there are more files). Line 527: /bin/sed -i "/${start_conf_section}/,/${end_conf_section}/d" \ Line 528: %{_sysconfdir}/libvirt/libvirtd.conf \ Line 529: %{_sysconfdir}/libvirt/qemu.conf \ Line 530: %{_sysconfdir}/sysconfig/libvirtd \
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 4:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1191/ (1/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 4:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/337/ (2/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 4:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1226/ (3/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Yaniv Bronhaim has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 4: (1 inline comment)
.................................................... File vdsm.spec.in Line 524: start_conf_section="## beginning of configuration section by vdsm" Line 525: end_conf_section="## end of configuration section by vdsm" Line 526: by_vdsm="by vdsm" Line 527: Line 528: /bin/sed -i -e "/${start_conf_section}/,/${end_conf_section}/d" \ Question:
when I add: -e "/${by_vdsm}/" it doesn't work at all..
any ideas why?
(Ill remove the white spaces when I add the removal of "by vdsm" sections) Line 529: %{_sysconfdir}/libvirt/libvirtd.conf \ Line 530: %{_sysconfdir}/libvirt/qemu.conf \ Line 531: %{_sysconfdir}/sysconfig/libvirtd \ Line 532: %{_sysconfdir}/sysctl.conf \
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 4:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1191/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1226/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/337/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 5:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1192/ (2/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 5:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/338/ (1/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 5:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1227/ (3/3)
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 5:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1192/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1227/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/338/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 5: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Douglas Schilling Landgraf has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 5: Looks good to me, but someone else must approve
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Yaniv Bronhaim has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 5: Fails
It doesn't work over Fedora.
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Yaniv Bronhaim has posted comments on this change.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Patch Set 5: Verified
I probably have something wrong with my fedora vm. It works great over other machines (fedora and rhel).
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Removing vdsm configuration when removing vdsm service ......................................................................
Removing vdsm configuration when removing vdsm service
Before we removed that section only over rhel and we looked for the wrong string. This patch adds sed command for both dist with the current string that is written by vdsmd init script.
Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=902346 Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com --- M vdsm.spec.in 1 file changed, 14 insertions(+), 6 deletions(-)
Approvals: Douglas Schilling Landgraf: Looks good to me, but someone else must approve Yaniv Bronhaim: Verified Dan Kenigsberg: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/11295 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged Gerrit-Change-Id: Ia8f59375e20efa6b5de8483a12a772f5f0ce3749 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimonce@redhat.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
vdsm-patches@lists.fedorahosted.org