|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
From 16e43715e9731db46b4ea519eb4c0c1294bf18a4 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
From: Igor Lvovsky <ilvovsky@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
Date: Tue, 12 Jun 2012 15:38:27 +0300
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
Subject: [PATCH 09/17] Use already known iface in addNetwork
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
Change-Id: I085792401a04d7695855e81b16b442e4c31ab706
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
Signed-off-by: Igor Lvovsky <ilvovsky@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
Reviewed-on: http://gerrit.ovirt.org/5283
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
Reviewed-by: Dan Kenigsberg <danken@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
Tested-by: Dan Kenigsberg <danken@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
Reviewed-on: http://gerrit.ovirt.org/5551
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
Tested-by: Federico Simoncelli <fsimonce@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
---
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
vdsm/configNetwork.py | 6 +++---
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
index 89b3047..87b32ed 100755
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
--- a/vdsm/configNetwork.py
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
+++ b/vdsm/configNetwork.py
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
@@ -629,10 +629,10 @@ def addNetwork(network, vlan=None, bonding=None, nics=None, ipaddr=None, netmask
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
ifup(bonding)
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
if vlan:
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
- iface += '.' + vlan
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
- configWriter.addVlan(vlan, bonding or nics[0], network=brName,
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
+ configWriter.addVlan(vlan, iface, network=brName,
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
mtu=mtu, bridged=bridged)
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
- ifup((bonding or nics[0]) + '.' + vlan)
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
+ iface += '.' + vlan
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
+ ifup(iface)
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
if bridged:
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
if options.get('bootproto') == 'dhcp' and not utils.tobool(options.get('blockingdhcp')):
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
--
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
1.7.1
|
|
![](https://seccdn.libravatar.org/avatar/462a60e1d169ce7ce64da9fb6b067f5c020a5e963dfca570256adc87ec5450f2?s=16&d=retro) |
83b9f8f |
|