Merge pull request #3838 from petrblaho/fix-no-method-error-from-uri-…

…parsing [openstack] Removes URI::encode call on parameteres
fog · Feb 10, 2016 · 120c158 · 120c158
2 parents 3691afd + 12a61d1
commit 120c158
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/lib/fog/openstack/requests/baremetal/set_node_maintenance.rb b/lib/fog/openstack/requests/baremetal/set_node_maintenance.rb
@@ -3,17 +3,11 @@ module Baremetal
     class OpenStack
       class Real
         def set_node_maintenance(node_uuid, parameters=nil)
-          if parameters
-            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
-          else
-            query = {}
-          end
-
           request(
             :expects => [200, 202, 204],
             :method => 'PUT',
             :path => "nodes/#{node_uuid}/maintenance",
-            :query   => query
+            :query   => parameters
           )
         end
       end

diff --git a/lib/fog/openstack/requests/baremetal/unset_node_maintenance.rb b/lib/fog/openstack/requests/baremetal/unset_node_maintenance.rb
@@ -3,17 +3,11 @@ module Baremetal
     class OpenStack
       class Real
         def unset_node_maintenance(node_uuid, parameters=nil)
-          if parameters
-            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
-          else
-            query = {}
-          end
-
           request(
             :expects => [200, 202, 204],
             :method => 'DELETE',
             :path => "nodes/#{node_uuid}/maintenance",
-            :query   => query
+            :query   => parameters
           )
         end
       end

diff --git a/lib/fog/openstack/requests/compute/list_services.rb b/lib/fog/openstack/requests/compute/list_services.rb
@@ -3,17 +3,11 @@ module Compute
     class OpenStack
       class Real
         def list_services(parameters=nil)
-          if parameters
-            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
-          else
-            query = {}
-          end
-
           request(
             :expects => [200, 203],
             :method  => 'GET',
             :path    => 'os-services',
-            :query   => query
+            :query   => parameters
           )
         end
       end