Douglas Schilling Landgraf has uploaded a new change for review. Change subject: network: use iproute instead of vconfig ......................................................................
network: use iproute instead of vconfig oVirt Node uses vconfig tool only to delete vlans. This tool is deprecated in favor of "ip link" command. Change-Id: Ib73e74c3c90ce28ff88cc1a80dc41f79121932b1 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1127682 Signed-off-by: Douglas Schilling Landgraf <[email protected]> --- M recipe/centos6-pkgs.ks M recipe/ovirt19-pkgs.ks M recipe/ovirt20-pkgs.ks M recipe/rhevh6-pkgs.ks M recipe/rhevh7-pkgs.ks M src/ovirt/node/utils/network.py 6 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/41/32341/1 diff --git a/recipe/centos6-pkgs.ks b/recipe/centos6-pkgs.ks index 17f2915..422ef87 100644 --- a/recipe/centos6-pkgs.ks +++ b/recipe/centos6-pkgs.ks @@ -5,7 +5,7 @@ ltrace # keyboard layout system-config-keyboard-base -vconfig +iproute aic94xx-firmware bfa-firmware ql2500-firmware diff --git a/recipe/ovirt19-pkgs.ks b/recipe/ovirt19-pkgs.ks index de016fd..d6e7e0c 100644 --- a/recipe/ovirt19-pkgs.ks +++ b/recipe/ovirt19-pkgs.ks @@ -7,7 +7,7 @@ linux-firmware iptables net-tools -vconfig +iproute aic94xx-firmware bfa-firmware # Explicitly add these package, to prevent yum from pulling in the debug versions diff --git a/recipe/ovirt20-pkgs.ks b/recipe/ovirt20-pkgs.ks index 75d821a..d2cfca4 100644 --- a/recipe/ovirt20-pkgs.ks +++ b/recipe/ovirt20-pkgs.ks @@ -7,7 +7,7 @@ linux-firmware iptables net-tools -vconfig +iproute bfa-firmware grubby glusterfs-server diff --git a/recipe/rhevh6-pkgs.ks b/recipe/rhevh6-pkgs.ks index 72ac759..54742b0 100644 --- a/recipe/rhevh6-pkgs.ks +++ b/recipe/rhevh6-pkgs.ks @@ -14,7 +14,7 @@ ql2500-firmware aic94xx-firmware bfa-firmware -vconfig +iproute #default plugins ovirt-node-plugin-snmp ovirt-node-plugin-cim diff --git a/recipe/rhevh7-pkgs.ks b/recipe/rhevh7-pkgs.ks index c109131..5ec588a 100644 --- a/recipe/rhevh7-pkgs.ks +++ b/recipe/rhevh7-pkgs.ks @@ -4,6 +4,7 @@ libguestfs-winsupport net-tools +iproute ltrace vhostmd firewalld diff --git a/src/ovirt/node/utils/network.py b/src/ovirt/node/utils/network.py index 467d6b4..4ac725b 100644 --- a/src/ovirt/node/utils/network.py +++ b/src/ovirt/node/utils/network.py @@ -787,7 +787,7 @@ class Vlans(base.Base): - """A class to offer a convenience api to the vconfig file + """A class to offer a convenience api for vlans """ cfgfilename = "/proc/net/vlan/config" @@ -848,7 +848,7 @@ if not self.is_vlan_device(ifname): raise RuntimeError("Can no delete '%s', is no vlan device" % ifname) - process.call(["vconfig", "rem", ifname]) + process.call(["ip", "link", "del", ifname]) class Bridges(base.Base): -- To view, visit http://gerrit.ovirt.org/32341 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib73e74c3c90ce28ff88cc1a80dc41f79121932b1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
