Mark Wu has uploaded a new change for review.
Change subject: Replace 'ovirtmgmt' with the macro 'VDSMBRIDGE' ......................................................................
Replace 'ovirtmgmt' with the macro 'VDSMBRIDGE'
Change-Id: I5bed59e5befc340ea988923887e1b5aa597959b3 Signed-off-by: Mark Wu wudxw@linux.vnet.ibm.com --- M .gitignore R vdsm/configNetwork.py.in 2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/7402/1
diff --git a/.gitignore b/.gitignore index 8a63a02..e3ef9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ vdsm-*.tar.gz vdsm.spec vdsm/config.py +vdsm/configNetwork.py vdsm/constants.py vdsm/dsaversion.py vdsm/dumpStorageTable.py diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py.in similarity index 99% rename from vdsm/configNetwork.py rename to vdsm/configNetwork.py.in index 0617bbe..30a5bd4 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py.in @@ -1037,7 +1037,7 @@ def editNetwork(oldBridge, newBridge, vlan=None, bonding=None, nics=None, **options): configWriter = ConfigWriter() dhcpEvt = None - if newBridge == 'ovirtmgmt' and options.get('bootproto') == 'dhcp' and \ + if newBridge == '@VDSMBRIDGE@' and options.get('bootproto') == 'dhcp' and \ not utils.tobool(options.get('blockingdhcp')): dhcpEvt = threading.Event() try: @@ -1250,7 +1250,7 @@ d['nics'] = [d.pop('nic')] d['force'] = force
- if network == 'ovirtmgmt' and d.get('bootproto') == 'dhcp' and \ + if network == '@VDSMBRIDGE@' and d.get('bootproto') == 'dhcp' and \ not utils.tobool(d.get('blockingdhcp')): dhcpEvt = threading.Event()
-- To view, visit http://gerrit.ovirt.org/7402 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I5bed59e5befc340ea988923887e1b5aa597959b3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu wudxw@linux.vnet.ibm.com