Browse Source

Change deprecated auth_plugin to auth_type

In the keystone_authtoken section, the key has already been changed
from auth_plugin to auth_type. This patch does the same for the trustee
section (see [1]).

[1] https://docs.openstack.org/heat/pike/install/install-ubuntu.html

Change-Id: Idd82170107043bc2497261c34859844343e783a1
Roger Luethi 1 year ago
parent
commit
fb1c143c65
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      attributes/heat_conf.rb
  2. 1
    1
      spec/spec_helper.rb

+ 1
- 1
attributes/heat_conf.rb View File

@@ -26,6 +26,6 @@ default['openstack']['orchestration']['conf']['keystone_authtoken']['username']
26 26
 default['openstack']['orchestration']['conf']['keystone_authtoken']['project_name'] = 'service'
27 27
 default['openstack']['orchestration']['conf']['keystone_authtoken']['project_domain_name'] = 'Default'
28 28
 default['openstack']['orchestration']['conf']['keystone_authtoken']['user_domain_name'] = 'Default'
29
-default['openstack']['orchestration']['conf']['trustee']['auth_plugin'] = 'v3password'
29
+default['openstack']['orchestration']['conf']['trustee']['auth_type'] = 'v3password'
30 30
 default['openstack']['orchestration']['conf']['trustee']['username'] = 'heat'
31 31
 default['openstack']['orchestration']['conf']['trustee']['user_domain_name'] = node['openstack']['orchestration']['conf']['keystone_authtoken']['user_domain_name']

+ 1
- 1
spec/spec_helper.rb View File

@@ -223,7 +223,7 @@ shared_examples 'expects to create heat conf' do
223 223
       it 'has default trustee values' do
224 224
         [
225 225
           %r{^auth_url = http://127.0.0.1:35357/v3$},
226
-          /^auth_plugin = v3password$/,
226
+          /^auth_type = v3password$/,
227 227
           /^username = heat$/,
228 228
           /^password = heat-pass$/,
229 229
           /^user_domain_name = Default$/,

Loading…
Cancel
Save