Browse Source

Newton / Identity V3 fix

- added user_domain_name attribute for trustee section

Change-Id: Ie88e3c3288fb7d4b3f9c2ef91e668e5fe4149062
Christoph Albers 2 years ago
parent
commit
4f2e23c62d
2 changed files with 3 additions and 1 deletions
  1. 1
    0
      attributes/heat_conf.rb
  2. 2
    1
      spec/spec_helper.rb

+ 1
- 0
attributes/heat_conf.rb View File

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

+ 2
- 1
spec/spec_helper.rb View File

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

Loading…
Cancel
Save