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
This commit is contained in:
Roger Luethi 2017-11-02 14:10:54 +01:00
parent d8f3af044e
commit fb1c143c65
2 changed files with 2 additions and 2 deletions

View File

@ -26,6 +26,6 @@ default['openstack']['orchestration']['conf']['keystone_authtoken']['username']
default['openstack']['orchestration']['conf']['keystone_authtoken']['project_name'] = 'service'
default['openstack']['orchestration']['conf']['keystone_authtoken']['project_domain_name'] = 'Default'
default['openstack']['orchestration']['conf']['keystone_authtoken']['user_domain_name'] = 'Default'
default['openstack']['orchestration']['conf']['trustee']['auth_plugin'] = 'v3password'
default['openstack']['orchestration']['conf']['trustee']['auth_type'] = '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']

View File

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