deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [3/3] git commit: DTACLOUD-477 - Remove realm<->region mapping for Openstack created Instance
Date Fri, 22 Feb 2013 17:12:46 GMT
Updated Branches:
  refs/heads/master a5953e975 -> 4b7f71d05


DTACLOUD-477 - Remove realm<->region mapping for Openstack created Instance

https://issues.apache.org/jira/browse/DTACLOUD-477


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/4b7f71d0
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/4b7f71d0
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/4b7f71d0

Branch: refs/heads/master
Commit: 4b7f71d05ffda7db912280ae9347c8c8741b6957
Parents: d020637
Author: marios <marios@redhat.com>
Authored: Fri Feb 22 19:11:11 2013 +0200
Committer: marios <marios@redhat.com>
Committed: Fri Feb 22 19:11:11 2013 +0200

----------------------------------------------------------------------
 .../drivers/openstack/openstack_driver.rb          |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/4b7f71d0/server/lib/deltacloud/drivers/openstack/openstack_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/openstack/openstack_driver.rb b/server/lib/deltacloud/drivers/openstack/openstack_driver.rb
index 248cf2a..356d835 100644
--- a/server/lib/deltacloud/drivers/openstack/openstack_driver.rb
+++ b/server/lib/deltacloud/drivers/openstack/openstack_driver.rb
@@ -203,7 +203,7 @@ module Deltacloud
           end
           safely do
             server = os.create_server(params)
-            result = convert_from_server(server, os.connection.authuser, get_attachments(server.id,
os), os.connection.region)
+            result = convert_from_server(server, os.connection.authuser, get_attachments(server.id,
os))
           end
           result
         end
@@ -538,7 +538,7 @@ private
                     })
         end
 
-        def convert_from_server(server, owner, attachments=[], region=nil)
+        def convert_from_server(server, owner, attachments=[])
           op = (server.class == Hash)? :fetch : :send
           image = server.send(op, :image)
           flavor = server.send(op, :flavor)
@@ -549,7 +549,7 @@ private
           end
           inst = Instance.new(
             :id => server.send(op, :id).to_s,
-            :realm_id => region || "n/a",
+            :realm_id => "default",
             :owner_id => owner,
             :description => server.send(op, :name),
             :name => server.send(op, :name),


Mime
View raw message