openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

Newton / Identity V3 fix 

- added user_domain_name attribute for trustee section

Change-Id: Ie88e3c3288fb7d4b3f9c2ef91e668e5fe4149062
This commit is contained in:
Christoph Albers 2017-01-02 15:02:23 +01:00
parent e00cf744d2
commit 4f2e23c62d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
attributes/heat_conf.rb
View File

@ -26,3 +26,4 @@ default['openstack']['orchestration']['conf']['keystone_authtoken']['project_dom
default['openstack']['orchestration']['conf']['keystone_authtoken']['user_domain_name'] = 'Default'
default['openstack']['orchestration']['conf']['trustee']['auth_plugin'] = 'v3password'
default['openstack']['orchestration']['conf']['trustee']['username'] = 'heat'
default['openstack']['orchestration']['conf']['trustee']['user_domain_name'] = node['openstack']['orchestration']['conf']['keystone_authtoken']['user_domain_name']

3
spec/spec_helper.rb
View File

@ -221,7 +221,8 @@ shared_examples 'expects to create heat conf' do
%r{^auth_url = http://127.0.0.1:35357/v3$},
/^auth_plugin = v3password$/,
/^username = heat$/,
/^password = heat-pass$/
/^password = heat-pass$/,
/^user_domain_name = Default$/
].each do |line|
expect(chef_run).to render_config_file(file.name).with_section_content('trustee', line)
end