From 187265f8283cb0dd3416c3d6bc46f09f5e7b9586 Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Fri, 16 Mar 2012 17:53:46 +0100
Subject: [PATCH] feature #1112: Add cluster and datastore support to econe

---
 src/cloud/ec2/etc/econe.conf        | 3 +++
 src/cloud/ec2/lib/EC2QueryServer.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cloud/ec2/etc/econe.conf b/src/cloud/ec2/etc/econe.conf
index f9ba61e670..02e352aa1b 100644
--- a/src/cloud/ec2/etc/econe.conf
+++ b/src/cloud/ec2/etc/econe.conf
@@ -37,6 +37,9 @@
 # 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG
 :debug_level: 3
 
+:cluster_id:
+:datastore_id:
+
 # VM types allowed and its template file (inside templates directory)
 :instance_types:
   :m1.small:
diff --git a/src/cloud/ec2/lib/EC2QueryServer.rb b/src/cloud/ec2/lib/EC2QueryServer.rb
index 66c14ad2a0..9b02650a9c 100644
--- a/src/cloud/ec2/lib/EC2QueryServer.rb
+++ b/src/cloud/ec2/lib/EC2QueryServer.rb
@@ -79,7 +79,7 @@ class EC2QueryServer < CloudServer
             return OpenNebula::Error.new('Unsupported'), 400
         end
 
-        rc = image.allocate(template)
+        rc = image.allocate(template, @config[:datastore_id]||1)
         if OpenNebula.is_error?(rc)
             return OpenNebula::Error.new('Unsupported'), 400
         end