From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: virt: drop unused guests_gateway_ip
......................................................................
virt: drop unused guests_gateway_ip
guests_gateway_ip is a prehistoric configurable, that has been
completely replaced by display network.
If it is ever used, it renderes a VM non-migratible (as the graphics
address on one host should not exist on the destination host, too).
This patch drops something that should have been removed many years ago,
with the introduction of libvirtvm.py.
Change-Id: Ia2e08388ffab439cb8985d4f220a410b4f6b6c90
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/config.py.in
M lib/vdsm/virt/vmdevices/graphics.py
2 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/75150/1
diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index 3fb17d5..53b30a9 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -414,8 +414,6 @@
'Set to "0.0.0.0" to listen only on IPv4. '
'Set to "::" to listen on both IPv4 & IPv6.'),
- ('guests_gateway_ip', '', None),
-
('broker_address', '127.0.0.1',
'Address where the broker is listening at. Use an empty string '
'for none'),
diff --git a/lib/vdsm/virt/vmdevices/graphics.py b/lib/vdsm/virt/vmdevices/graphics.py
index bb8aa9e..f5bf419 100644
--- a/lib/vdsm/virt/vmdevices/graphics.py
+++ b/lib/vdsm/virt/vmdevices/graphics.py
@@ -233,7 +233,7 @@
if network in nets else network)
ip, _, _, _ = net_api.ip_addrs_info(device)
except (libvirt.libvirtError, KeyError, IndexError):
- ip = config.get('addresses', 'guests_gateway_ip')
+ ip = '0'
finally:
if ip == '':
ip = '0'
--
To view, visit
https://gerrit.ovirt.org/75150
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2e08388ffab439cb8985d4f220a410b4f6b6c90
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>