openstack
/
fuel-library
Code Issues Proposed changes

Merge "Update in heat_domain_id_setter"

This commit is contained in:
Jenkins 2015-04-21 13:05:27 +00:00 committed by Gerrit Code Review
parent 898985b138 c0893e6f14
commit 073e54e093
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/heat/lib/puppet/provider/heat_domain_id_setter/ruby.rb
View File

@ -93,7 +93,7 @@ def keystone_v2_authenticate(auth_url,
if tenantName
post_args['auth']['tenantName'] = tenantName
end
auth_url.sub!('v3', 'v2.0')
url = URI.parse("#{auth_url}/tokens")
req = Net::HTTP::Post.new url.path
req['content-type'] = 'application/json'

2
deployment/puppet/osnailyfacter/modular/heat/heat.pp
View File

@ -107,7 +107,7 @@ class { 'heat::docker_resource' :
}
class { 'heat::keystone::domain' :
auth_url => "http://${controller_node_address}:5000/v2.0",
auth_url => "http://${controller_node_address}:35357/v2.0",
keystone_admin => 'heat',
keystone_password => $heat_hash['user_password'],
keystone_tenant => 'services',