Omer Frenkel has uploaded a new change for review.

Change subject: core: don't send cloud-init drive automatically
......................................................................

core: don't send cloud-init drive automatically

Currently cloud init is sent automatically on first run,
just as sysprep is sent for windows vms.

The problem is that currently cloud init configuration is not stored in
the engine db, while sysprep does (in sysprep files).

Until this gap is implemented, this patch changes the logic not to send
cloud init drive automatically, only on user request.

Change-Id: I1a0da2fef22e31d27a888e38679fe122f946e8c5
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1014194
Signed-off-by: Omer Frenkel <ofren...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/21328/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
index ad53970..7e5ac16 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
@@ -627,7 +627,8 @@
                 if (!getVm().isInitialized()) {
                     
getVm().setInitializationType(osRepository.isWindows(getVm().getVmOsId()) ?
                             InitializationType.Sysprep :
-                            InitializationType.CloudInit);
+                            // TODO: we should use cloud init automatically 
only when cloud init configuration will be available
+                            InitializationType.None);
                 }
             } else {
                 
getVm().setInitializationType(getParameters().getInitializationType());


-- 
To view, visit http://gerrit.ovirt.org/21328
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a0da2fef22e31d27a888e38679fe122f946e8c5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Omer Frenkel <ofren...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to