openstack/fuel-library
Code Issues Proposed changes

Update in heat_domain_id_setter

Browse Source 
* add keystone api version reset in auth_url
* changed used keystone api port  5000 -> 35357

Change-Id: I4c0df7600e10d57429eda854cd8aa6208e1c6539
Closes-Bug: #1445422
This commit is contained in:
Igor Yozhikov 2015-04-21 02:54:07 +03:00
parent b878f1ae8e
commit c0893e6f14
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 if tenantName
post_args['auth']['tenantName'] = tenantName post_args['auth']['tenantName'] = tenantName
end end
auth_url.sub!('v3', 'v2.0')
url = URI.parse("#{auth_url}/tokens") url = URI.parse("#{auth_url}/tokens")
req = Net::HTTP::Post.new url.path req = Net::HTTP::Post.new url.path
req['content-type'] = 'application/json' 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' : 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_admin => 'heat',
keystone_password => $heat_hash['user_password'], keystone_password => $heat_hash['user_password'],
keystone_tenant => 'services', keystone_tenant => 'services',