From 4fc2f972793ef61e8bb8c541633ccacb20ddcc43 Mon Sep 17 00:00:00 2001
From: Jay Pipes <jaypipes@gmail.com>
Date: Fri, 7 Dec 2012 18:22:13 -0500
Subject: [PATCH] Make sure we URI.decode the endpoint URLs

---
 recipes/api.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/recipes/api.rb b/recipes/api.rb
index f432a09..917c254 100644
--- a/recipes/api.rb
+++ b/recipes/api.rb
@@ -18,6 +18,8 @@
 # limitations under the License.
 #
 
+require "uri"
+
 class ::Chef::Recipe
   include ::Openstack
   include ::Opscode::OpenSSL::Password
@@ -102,9 +104,9 @@ keystone_register "Register Cinder Volume Service" do
   service_type "volume"
   service_description "Cinder Volume Service"
   endpoint_region node["cinder"]["region"]
-  endpoint_adminurl api_endpoint.to_s
-  endpoint_internalurl api_endpoint.to_s
-  endpoint_publicurl api_endpoint.to_s
+  endpoint_adminurl ::URI.decode api_endpoint.to_s
+  endpoint_internalurl ::URI.decode api_endpoint.to_s
+  endpoint_publicurl ::URI.decode api_endpoint.to_s
 
   action :create_service
 end
@@ -119,9 +121,9 @@ keystone_register "Register Cinder Volume Endpoint" do
   service_type "volume"
   service_description "Cinder Volume Service"
   endpoint_region node["cinder"]["region"]
-  endpoint_adminurl api_endpoint.to_s
-  endpoint_internalurl api_endpoint.to_s
-  endpoint_publicurl api_endpoint.to_s
+  endpoint_adminurl ::URI.decode api_endpoint.to_s
+  endpoint_internalurl ::URI.decode api_endpoint.to_s
+  endpoint_publicurl ::URI.decode api_endpoint.to_s
 
   action :create_endpoint
 end