Make sure we URI.decode the endpoint URLs
This commit is contained in:
parent
c82ef4dbc8
commit
4fc2f97279
|
@ -18,6 +18,8 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
require "uri"
|
||||||
|
|
||||||
class ::Chef::Recipe
|
class ::Chef::Recipe
|
||||||
include ::Openstack
|
include ::Openstack
|
||||||
include ::Opscode::OpenSSL::Password
|
include ::Opscode::OpenSSL::Password
|
||||||
|
@ -102,9 +104,9 @@ keystone_register "Register Cinder Volume Service" do
|
||||||
service_type "volume"
|
service_type "volume"
|
||||||
service_description "Cinder Volume Service"
|
service_description "Cinder Volume Service"
|
||||||
endpoint_region node["cinder"]["region"]
|
endpoint_region node["cinder"]["region"]
|
||||||
endpoint_adminurl api_endpoint.to_s
|
endpoint_adminurl ::URI.decode api_endpoint.to_s
|
||||||
endpoint_internalurl api_endpoint.to_s
|
endpoint_internalurl ::URI.decode api_endpoint.to_s
|
||||||
endpoint_publicurl api_endpoint.to_s
|
endpoint_publicurl ::URI.decode api_endpoint.to_s
|
||||||
|
|
||||||
action :create_service
|
action :create_service
|
||||||
end
|
end
|
||||||
|
@ -119,9 +121,9 @@ keystone_register "Register Cinder Volume Endpoint" do
|
||||||
service_type "volume"
|
service_type "volume"
|
||||||
service_description "Cinder Volume Service"
|
service_description "Cinder Volume Service"
|
||||||
endpoint_region node["cinder"]["region"]
|
endpoint_region node["cinder"]["region"]
|
||||||
endpoint_adminurl api_endpoint.to_s
|
endpoint_adminurl ::URI.decode api_endpoint.to_s
|
||||||
endpoint_internalurl api_endpoint.to_s
|
endpoint_internalurl ::URI.decode api_endpoint.to_s
|
||||||
endpoint_publicurl api_endpoint.to_s
|
endpoint_publicurl ::URI.decode api_endpoint.to_s
|
||||||
|
|
||||||
action :create_endpoint
|
action :create_endpoint
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue