Mailing-List: contact deltacloud-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
Reply-To: deltacloud-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1173571 -
 /incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
Date: Wed, 21 Sep 2011 11:14:05 -0000
To: deltacloud-commits@incubator.apache.org
From: mfojtik@apache.org
Message-Id: <20110921111405.B3D2F23888FD@eris.apache.org>

Author: mfojtik
Date: Wed Sep 21 11:14:05 2011
New Revision: 1173571

URL: http://svn.apache.org/viewvc?rev=1173571&view=rev
Log:
RHEVM: User data injection now works with floppy image instead of libguestfs

Modified:
    incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb

Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb?rev=1173571&r1=1173570&r2=1173571&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb Wed Sep 21 11:14:05 2011
@@ -23,10 +23,9 @@ require 'json'
 
 module RHEVM
 
-  #
-  # NOTE: Change this if you want to use Windows machine to (/c/something)
-  #
-  FILEINJECT_PATH = "/tmp/deltacloud.txt"
+  # NOTE: Injected file will be available in floppy drive inside
+  #       the instance. (Be sure you 'modprobe floppy' on Linux)
+  FILEINJECT_PATH = "deltacloud.txt"
 
   def self.client(url)
     RestClient::Resource.new(url)
@@ -123,13 +122,6 @@ module RHEVM
           }
           if opts[:user_data] and not opts[:user_data].empty?
             if api_version?('3') and cluster_version?((opts[:realm_id] || clusters.first.id), '3')
-              #
-              # Clone is necessary to keep provisioning same as original template
-              # https://bugzilla.redhat.com/show_bug.cgi?id=733695
-              #
-              disks {
-                clone_ "true"
-              }
               custom_properties {
                 #
                 # FIXME: 'regexp' parameter is just a temporary workaround. This
@@ -137,7 +129,7 @@ module RHEVM
                 # RHEV-M release.
                 #
                 custom_property({
-                  :name => "fileinject",
+                  :name => "floppyinject",
                   :value => "#{RHEVM::FILEINJECT_PATH}:#{escape_user_data(Base64.decode64(opts[:user_data]))}",
                   :regexp => "^.*:.*$"})
               }