Dan Kenigsberg has uploaded a new change for review.
Change subject: vdsmd.init: retire ifconfig ......................................................................
vdsmd.init: retire ifconfig
Replace ifconfig with iproute2's /sbin/ip also in our init script. Drop an old irrelevant comment that mentions ifconfig.
Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Signed-off-by: Dan Kenigsberg danken@redhat.com --- M vdsm/netinfo.py M vdsm/vdsmd.init.in 2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/9385/1
diff --git a/vdsm/netinfo.py b/vdsm/netinfo.py index b6d1a1f..7b28fae 100644 --- a/vdsm/netinfo.py +++ b/vdsm/netinfo.py @@ -274,9 +274,9 @@ def get(): d = {} routes = getRoutes() - # FIXME handle bridge/nic missing from ifconfig d['networks'] = {} nets = networks() + for netname in nets.iterkeys(): if nets[netname]['bridged']: devname = netname diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in index 53ad8af..e1df196 100755 --- a/vdsm/vdsmd.init.in +++ b/vdsm/vdsmd.init.in @@ -179,7 +179,7 @@ }
test_lo() { - if ! LC_ALL=C /sbin/ifconfig lo | /bin/grep -q UP; + if ! LC_ALL=C /sbin/ip lo | /bin/grep -q UP; then log_failure_msg "VDSMD: lo interface is down, can't run !" echo "VDSMD: lo interface is down, can't run !" > /dev/kmsg
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/117/ (1/2)
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/83/ (2/2)
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 1: Fails
Build Failed
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/83/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/117/ : FAILURE
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Antoni Segura Puimedon has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 1: Looks good to me, but someone else must approve
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Hunt Xu has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 1: I would prefer that you didn't submit this
(1 inline comment)
'/sbin/ip lo' reports 'Object "lo" is unknown, try "ip help".'
.................................................... File vdsm/vdsmd.init.in Line 178: /sbin/service iscsid force-start Line 179: } Line 180: Line 181: test_lo() { Line 182: if ! LC_ALL=C /sbin/ip lo | /bin/grep -q UP; ip link show lo? Line 183: then Line 184: log_failure_msg "VDSMD: lo interface is down, can't run !" Line 185: echo "VDSMD: lo interface is down, can't run !" > /dev/kmsg Line 186: return 1
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Hunt Xu mhuntxu@gmail.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/85/ (2/2)
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Hunt Xu mhuntxu@gmail.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/119/ (1/2)
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Hunt Xu mhuntxu@gmail.com Gerrit-Reviewer: oVirt Jenkins CI Server
Antoni Segura Puimedon has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 2: Looks good to me, but someone else must approve
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Hunt Xu mhuntxu@gmail.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 2: Fails
Build Failed
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/85/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/119/ : FAILURE
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Hunt Xu mhuntxu@gmail.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 1: (1 inline comment)
.................................................... File vdsm/vdsmd.init.in Line 178: /sbin/service iscsid force-start Line 179: } Line 180: Line 181: test_lo() { Line 182: if ! LC_ALL=C /sbin/ip lo | /bin/grep -q UP; oldest failure in the book - test one thing, post another. thanks! Line 183: then Line 184: log_failure_msg "VDSMD: lo interface is down, can't run !" Line 185: echo "VDSMD: lo interface is down, can't run !" > /dev/kmsg Line 186: return 1
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Hunt Xu mhuntxu@gmail.com Gerrit-Reviewer: oVirt Jenkins CI Server
Hunt Xu has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 2: Looks good to me, but someone else must approve
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Hunt Xu mhuntxu@gmail.com Gerrit-Reviewer: oVirt Jenkins CI Server
Igor Lvovsky has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 2: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Hunt Xu mhuntxu@gmail.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: vdsmd.init: retire ifconfig ......................................................................
Patch Set 2: Verified
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Hunt Xu mhuntxu@gmail.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com
Dan Kenigsberg has submitted this change and it was merged.
Change subject: vdsmd.init: retire ifconfig ......................................................................
vdsmd.init: retire ifconfig
Replace ifconfig with iproute2's /sbin/ip also in our init script. Drop an old irrelevant comment that mentions ifconfig.
Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Signed-off-by: Dan Kenigsberg danken@redhat.com --- M vdsm/netinfo.py M vdsm/vdsmd.init.in 2 files changed, 2 insertions(+), 2 deletions(-)
Approvals: Hunt Xu: Looks good to me, but someone else must approve Antoni Segura Puimedon: Looks good to me, but someone else must approve Dan Kenigsberg: Verified Igor Lvovsky: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Hunt Xu mhuntxu@gmail.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com
vdsm-patches@lists.fedorahosted.org