Simone Tiraboschi has uploaded a new change for review.
Change subject: packaging: setup: honouring OVEHOSTED_VM/vmVCpus from answerfile
......................................................................
packaging: setup: honouring OVEHOSTED_VM/vmVCpus from answerfile
Let value from the answerfile win over the OVF one
Change-Id: Iee514e9066d69852a60e606a93f6a59e23e26c87
Signed-off-by: Simone Tiraboschi <stira...@redhat.com>
---
M src/plugins/ovirt-hosted-engine-setup/vm/boot_disk.py
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup
refs/changes/58/42158/1
diff --git a/src/plugins/ovirt-hosted-engine-setup/vm/boot_disk.py
b/src/plugins/ovirt-hosted-engine-setup/vm/boot_disk.py
index e672d34..b3e6166 100644
--- a/src/plugins/ovirt-hosted-engine-setup/vm/boot_disk.py
+++ b/src/plugins/ovirt-hosted-engine-setup/vm/boot_disk.py
@@ -349,9 +349,12 @@
'}cpu_per_socket'
).text
)
- self.environment[
+ if self.environment[
ohostedcons.VMEnv.VCPUS
- ] = str(num_of_sockets * cpu_per_socket)
+ ] is None:
+ self.environment[
+ ohostedcons.VMEnv.VCPUS
+ ] = str(num_of_sockets * cpu_per_socket)
self.logger.debug('Configuring memory')
unit = tree.find(
'Content/Section/Item/{'
--
To view, visit https://gerrit.ovirt.org/42158
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee514e9066d69852a60e606a93f6a59e23e26c87
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-hosted-engine-setup
Gerrit-Branch: master
Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
