bosh_openstack_cpi 0.0.6 → 0.0.7

data/USAGE.md

@@ -19,6 +19,8 @@ These options are passed to the OpenStack CPI when it is instantiated.
   OpenStack tenant name
 * `region` (optional)
   OpenStack region
+* `endpoint_type` (optional)
+  OpenStack endpoint type for Glance
 * `default_key_name` (required)
   default OpenStack ssh key name to assign to created virtual machines
 * `default_security_group` (required)

data/lib/cloud/openstack/cloud.rb

@@ -47,7 +47,10 @@ module Bosh::OpenStackCloud
         :openstack_auth_url => @openstack_properties["auth_url"],
         :openstack_username => @openstack_properties["username"],
         :openstack_api_key => @openstack_properties["api_key"],
-        :openstack_tenant => @openstack_properties["tenant"]
+        :openstack_tenant => @openstack_properties["tenant"],
+        :openstack_region => @openstack_properties["region"],
+        :openstack_endpoint_type => @openstack_properties["endpoint_type"] ||
+                                    "publicURL"
       }
       @glance = Fog::Image.new(glance_params)
 

data/lib/cloud/openstack/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/spec/spec_helper.rb

@@ -46,7 +46,8 @@ def mock_cloud_options
       "auth_url" => "http://127.0.0.1:5000/v2.0/tokens",
       "username" => "admin",
       "api_key" => "nova",
-      "tenant" => "admin"
+      "tenant" => "admin",
+      "region" => "RegionOne"
     },
     "registry" => {
       "endpoint" => "localhost:42288",

data/spec/unit/cloud_spec.rb

@@ -17,36 +17,15 @@ describe Bosh::OpenStackCloud::Cloud do
     	options = Hash.new("options")
     	expect { 
     		Bosh::OpenStackCloud::Cloud.new(options)
-    	}.to raise_error(ArgumentError)
+    	}.to raise_error(ArgumentError, /Invalid OpenStack configuration/)
     end
 
-    it "raises ArgumentError on initializing with non Hashoptions" do
+    it "raises ArgumentError on initializing with non Hash options" do
     	options = "this is a string"
     	expect { 
     		Bosh::OpenStackCloud::Cloud.new(options)
-    	}.to raise_error(ArgumentError)
+    	}.to raise_error(ArgumentError, /Invalid OpenStack configuration/)
     end
 
-    it "should create a Cloud Instance on giving valid params" do
-      openstack = { "auth_url" => "http://localhost/",
-                    "username" =>"testuser",
-          				  "api_key" => "test_api_key",
-          				 "tenant" => "test_tenant"
-          			  }
-      registry = { "endpoint" => "http://0.0.0.0",
-          	       "user" => "testuser",
-          	       "password" => "password"
-                 }
-      options = { "openstack" => openstack,
-                  "registry" => registry
-                }
-      socket_error = false
-      begin
-        cloud = Bosh::OpenStackCloud::Cloud.new(options)
-        rescue Excon::Errors::SocketError => e
-          socket_error = true
-        end
-      socket_error.should be_true
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement