Merge "placement: os_region_name -> region_name"

This commit is contained in:
Zuul 2018-10-05 09:06:12 +00:00 committed by Gerrit Code Review
commit d9446a64f2
2 changed files with 2 additions and 2 deletions

View File

@ -49,7 +49,7 @@ default['openstack']['compute']['conf'].tap do |conf|
# [placement] section
conf['placement']['auth_type'] = 'password'
conf['placement']['os_region_name'] = node['openstack']['region']
conf['placement']['region_name'] = node['openstack']['region']
conf['placement']['username'] = 'placement'
conf['placement']['user_domain_name'] = 'Default'
conf['placement']['project_domain_name'] = 'Default'

View File

@ -134,7 +134,7 @@ describe 'openstack-compute::nova-common' do
it 'has correct authentication settings' do
[
'auth_type = password',
'os_region_name = RegionOne',
'region_name = RegionOne',
'password = placement-pass',
'username = placement',
'project_name = service',