Change in vdsm[master]: Replace 'ovirtmgmt' with the macro 'VDSMBRIDGE'
by wudxw@linux.vnet.ibm.com
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(a)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(a)linux.vnet.ibm.com>
11 years, 10 months
Change in vdsm[master]: BZ#849542 bootstrap: set system time as soon as possible
by Alon Bar-Lev
Alon Bar-Lev has uploaded a new change for review.
Change subject: BZ#849542 bootstrap: set system time as soon as possible
......................................................................
BZ#849542 bootstrap: set system time as soon as possible
CURRENT BEHAVIOR
Set system time after installation.
NEW BEHAVIOR
Set system time at first stage. This makes the time difference between
engine and host set to minimum.
Change-Id: I15f2ae43dfacf3bd38c860985d572c7513a1ee6d
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M vds_bootstrap/vds_bootstrap.py
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/7380/1
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 8211c81..537953d 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -868,6 +868,11 @@
oDeploy = Deploy()
+ if systime:
+ if not oDeploy.setSystemTime(systime):
+ logging.error('setSystemTime failed')
+ return False
+
if not oDeploy.checkRegistration():
logging.error('checkRegistration test failed')
return False
@@ -919,11 +924,6 @@
if firewallRulesFile:
if not oDeploy.overrideFirewall(firewallRulesFile):
logging.error('Failed to set default firewall')
- return False
-
- if systime:
- if not oDeploy.setSystemTime(systime):
- logging.error('setSystemTime failed')
return False
if not oDeploy.verifyServices():
--
To view, visit http://gerrit.ovirt.org/7380
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15f2ae43dfacf3bd38c860985d572c7513a1ee6d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: Use setattr instead of __dict__
by shuming@linux.vnet.ibm.com
Shu Ming has uploaded a new change for review.
Change subject: Use setattr instead of __dict__
......................................................................
Use setattr instead of __dict__
It is bad to access the __dict__ directly
Change-Id: I685057743eec8ab76a274a7546199f7115903ba7
Signed-off-by: Shu Ming <shuming(a)linux.vnet.ibm.com>
---
M vdsm/storage/dispatcher.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/6870/1
--
To view, visit http://gerrit.ovirt.org/6870
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I685057743eec8ab76a274a7546199f7115903ba7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Shu Ming <shuming(a)linux.vnet.ibm.com>
11 years, 10 months
Change in vdsm[master]: vdsmd.init: remove validation to reload config
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: vdsmd.init: remove validation to reload config
......................................................................
vdsmd.init: remove validation to reload config
packaged=`/bin/rpm -ql libvirt | /bin/grep libvirtd.upstart | /usr/bin/tail -1`
returns: "/usr/share/doc/libvirt.0.X.Y/libvirtd.upstart"
However, in oVirt Node/RHEV-H we don't have /usr/share/doc dir.
So, when executing:
/bin/cp -p "$packaged" "$target" || return 1
The above code will always execute 'return 1' since the source
$packaged doesn't exist, making the function exit before start libvirt
daemon via upstart.
Start operation is not often required, let's just reload configuration and start
libvirt daemon.
Change-Id: I7ea03070bf2849e10c74d7921eac9401e2768502
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm/vdsmd.init.in
1 file changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/4479/1
--
To view, visit http://gerrit.ovirt.org/4479
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ea03070bf2849e10c74d7921eac9401e2768502
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: Fix vdsm-faqemu VM launch failure on hosts with newer libvir...
by Ryan Harper
Ryan Harper has uploaded a new change for review.
Change subject: Fix vdsm-faqemu VM launch failure on hosts with newer libvirt
......................................................................
Fix vdsm-faqemu VM launch failure on hosts with newer libvirt
Since January 2012, libvirt now checks[1] for the presence of /dev/kvm before
starting a VM to generate better error messages when a VM doesn't start.
This breaks faqemu running in a VM (non-nested) or a host which doesn't have KVM
modules loaded. Work around this by touching the device node.
v1->v2
- replace exec of touch with open+write+close
1. libvirt commit hash 32f63e912d3bef42a7fa70a0f2d5b04b98afe936
Change-Id: Iffe19758171e3808e42ed50d309dc4be1f9492cc
Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com>
---
M vdsm_hooks/faqemu/vdsm-faqemu
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/7359/1
diff --git a/vdsm_hooks/faqemu/vdsm-faqemu b/vdsm_hooks/faqemu/vdsm-faqemu
index 218af7f..85822a9 100644
--- a/vdsm_hooks/faqemu/vdsm-faqemu
+++ b/vdsm_hooks/faqemu/vdsm-faqemu
@@ -19,4 +19,8 @@
qemu_argv += [ "-no-kvm" ]
qemu_argv += filter(lambda x: x != "-enable-kvm", sys.argv[1:])
+# libvirt 0.9.10+ checks for the presence of /dev/kvm to provide
+# better error messages, but this breaks this hook, fake it out
+if not os.path.exists('/dev/kvm'):
+ open('/dev/kvm', 'w+').close()
os.execv(qemu_bin, qemu_argv)
--
To view, visit http://gerrit.ovirt.org/7359
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffe19758171e3808e42ed50d309dc4be1f9492cc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>
11 years, 10 months
Change in vdsm[master]: vdsm: generating uuid for libvirt configuration (#842115)
by ybronhei@redhat.com
Yaniv Bronhaim has uploaded a new change for review.
Change subject: vdsm: generating uuid for libvirt configuration (#842115)
......................................................................
vdsm: generating uuid for libvirt configuration (#842115)
during migration we found that if both hosts as the same uuid
libvirt fails the migration. this fix generate uniqe uuid only
during vdsm reconfiguration.
this uuid is saved in libvirtd.conf file and ha sbeen used after
libvirt service are restarted.
Change-Id: I12478f64850dc3b3e421a562762c020819c8be28
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M vdsm/vdsmd.init.in
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/7332/1
diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in
index efa6579..ee2b51a 100755
--- a/vdsm/vdsmd.init.in
+++ b/vdsm/vdsmd.init.in
@@ -347,6 +347,8 @@
set_if_default $lconf unix_sock_rw_perms \"0770\"
set_if_default $lconf auth_unix_rw \"sasl\"
set_if_default $qconf dynamic_ownership 0
+ set_if_default $lconf host_uuid \"$(uuidgen)\"
+
if [[ "$ssl" == true ]]; then
set_if_default $qconf spice_tls 1
else
--
To view, visit http://gerrit.ovirt.org/7332
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12478f64850dc3b3e421a562762c020819c8be28
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
11 years, 10 months
Change in vdsm[master]: faqemu: use domain type 'qemu' instead of the emulator wrapp...
by wudxw@linux.vnet.ibm.com
Mark Wu has uploaded a new change for review.
Change subject: faqemu: use domain type 'qemu' instead of the emulator wrapper
......................................................................
faqemu: use domain type 'qemu' instead of the emulator wrapper
Engine always set kvmEnabled' to 'true' when staring a VM. Then vdsm
will set domain type to 'kvm'. It will cause the following libivrt
error on a host without kvm support:
"libvirtError: unsupported configuration: Domain requires KVM, but
it is not available. Check that virtualization is enabled in the
host BIOS, and host configuration is setup to load the kvm modules."
This patch sets domain type to 'qemu' in faqemu hook to override what
set by vdsm core. Since libvirt can choose default emulator (qemu-system-
x86_64 for x86_64,qemu) according to the domain type, we don't need
use the emulator wrapper.
Change-Id: Ibd732d58a81977c1a2473485db92cd1787260e08
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
---
M vdsm.spec.in
M vdsm_hooks/faqemu/Makefile.am
M vdsm_hooks/faqemu/before_vm_start.py
D vdsm_hooks/faqemu/vdsm-faqemu
4 files changed, 2 insertions(+), 34 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/6391/1
--
To view, visit http://gerrit.ovirt.org/6391
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd732d58a81977c1a2473485db92cd1787260e08
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
11 years, 10 months
Change in vdsm[master]: Remove 'skipLibvirt' from NetworkOptions
by wudxw@linux.vnet.ibm.com
Mark Wu has uploaded a new change for review.
Change subject: Remove 'skipLibvirt' from NetworkOptions
......................................................................
Remove 'skipLibvirt' from NetworkOptions
The option 'skipLibvirt' was removed in commit ccb07ae. So it should
be removed from schema too.
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Change-Id: I41ff1f6686bfa448fd0b5953dd1d2983290d651c
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
---
M vdsm_api/vdsmapi-schema.json
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/7286/1
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
index 13a5bc9..fba27c1 100644
--- a/vdsm_api/vdsmapi-schema.json
+++ b/vdsm_api/vdsmapi-schema.json
@@ -64,14 +64,12 @@
#
# @bondingOptions: #optional A string of space-separated <option>=<value> pairs
#
-# @skipLibvirt: #optional Do not use libvirt to gather network information
-#
# Since: 4.10.0
##
{'type': 'NetworkOptions',
'data': {'*ipaddr', 'str', '*netmask': 'str', '*gateway': 'str',
'*bootproto': 'str', '*delay': 'uint', '*onboot': 'str',
- '*bondingOptions', 'str', 'skipLibvirt': 'bool'}}
+ '*bondingOptions', 'str'}}
##
# @Global.addNetwork:
--
To view, visit http://gerrit.ovirt.org/7286
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I41ff1f6686bfa448fd0b5953dd1d2983290d651c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
11 years, 10 months
Change in vdsm[master]: Enable fake_kvm_support on hosts without hardware VT support...
by wudxw@linux.vnet.ibm.com
Mark Wu has uploaded a new change for review.
Change subject: Enable fake_kvm_support on hosts without hardware VT support automatically
......................................................................
Enable fake_kvm_support on hosts without hardware VT support automatically
Change-Id: I76216ada10919b5e04e876d23fb9bea39859474c
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
---
M vdsm.spec.in
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/6062/1
--
To view, visit http://gerrit.ovirt.org/6062
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76216ada10919b5e04e876d23fb9bea39859474c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
11 years, 10 months
Change in vdsm[master]: BZ#838276 vds_bootstrap_complete remove deployUtil
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: BZ#838276 vds_bootstrap_complete remove deployUtil
......................................................................
BZ#838276 vds_bootstrap_complete remove deployUtil
Executing a host installation by REST API fails if deployUtil already
exists. This patch will remove when vds_bootstrap complete.
Change-Id: Idd907f0af83576eb1c7a33f2b82e199880867bdc
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vds_bootstrap/vds_bootstrap_complete.py
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/6358/1
--
To view, visit http://gerrit.ovirt.org/6358
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd907f0af83576eb1c7a33f2b82e199880867bdc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
11 years, 10 months