From 09b505768d786ae875c7bd746c253cbe4ed432a2 Mon Sep 17 00:00:00 2001 From: Ferran Rodenas Date: Tue, 5 Mar 2013 12:51:06 +0100 Subject: [PATCH] [openstack|network] Add endpoint_type option --- lib/fog/openstack/network.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/fog/openstack/network.rb b/lib/fog/openstack/network.rb index 2d84c0574..35cf4d979 100644 --- a/lib/fog/openstack/network.rb +++ b/lib/fog/openstack/network.rb @@ -7,7 +7,7 @@ module Fog requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, :openstack_tenant, - :openstack_api_key, :openstack_username, + :openstack_api_key, :openstack_username, :openstack_endpoint_type, :current_user, :current_tenant ## MODELS @@ -120,6 +120,7 @@ module Fog @openstack_must_reauthenticate = false @openstack_service_type = options[:openstack_service_type] || ['network'] @openstack_service_name = options[:openstack_service_name] + @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL' @connection_options = options[:connection_options] || {} @@ -192,7 +193,7 @@ module Fog :openstack_auth_token => @openstack_auth_token, :openstack_service_type => @openstack_service_type, :openstack_service_name => @openstack_service_name, - :openstack_endpoint_type => 'adminURL' + :openstack_endpoint_type => @openstack_endpoint_type } credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)