[Engine-patches] Change in ovirt-engine[master]: host-deploy: introduce virt enable flag

[Alon Bar-Lev]

Alon Bar-Lev has uploaded a new change for review.

Change subject: host-deploy: introduce virt enable flag
......................................................................

host-deploy: introduce virt enable flag

this will enable ovirt-host-deploy to distinguish between virt/gluster
and combinations.

Change-Id: Ie306a6032b772c8cbdfd7836d0463c969d013ff6
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java
M pom.xml
2 files changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/17861/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java
index 36d3684..e32108e 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java
@@ -57,6 +57,7 @@
 import org.ovirt.ovirt_host_deploy.constants.GlusterEnv;
 import org.ovirt.ovirt_host_deploy.constants.OpenStackEnv;
 import org.ovirt.ovirt_host_deploy.constants.VdsmEnv;
+import org.ovirt.ovirt_host_deploy.constants.VirtEnv;
 
 /**
  * Host deploy implementation.
@@ -435,6 +436,16 @@
                 _vds.getVdsGroupId()
             );
             _parser.cliEnvironmentSet(
+                VirtEnv.ENABLE,
+                vdsGroup.supportsVirtService()
+            );
+            return null;
+        }},
+        new Callable<Object>() { public Object call() throws Exception {
+            VDSGroup vdsGroup = DbFacade.getInstance().getVdsGroupDao().get(
+                _vds.getVdsGroupId()
+            );
+            _parser.cliEnvironmentSet(
                 GlusterEnv.ENABLE,
                 vdsGroup.supportsGlusterService()
             );
diff --git a/pom.xml b/pom.xml
index 09cf69d..1cfb242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
     <mina-core.version>2.0.1</mina-core.version>
     <sshd-core.version>0.7.0</sshd-core.version>
     <otopi.version>1.1.0-beta</otopi.version>
-    <ovirt-host-deploy.version>1.1.0-beta</ovirt-host-deploy.version>
+    <ovirt-host-deploy.version>1.1.0-beta-01</ovirt-host-deploy.version>
     <slf4j-jdk14.version>1.5.6</slf4j-jdk14.version>
     <gwt.version>2.5.1</gwt.version>
     <findbugs.version>2.5.2</findbugs.version>


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie306a6032b772c8cbdfd7836d0463c969d013ff6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches