Merge "placement: os_region_name -> region_name"
This commit is contained in:
commit
d9446a64f2
|
@ -49,7 +49,7 @@ default['openstack']['compute']['conf'].tap do |conf|
|
||||||
|
|
||||||
# [placement] section
|
# [placement] section
|
||||||
conf['placement']['auth_type'] = 'password'
|
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']['username'] = 'placement'
|
||||||
conf['placement']['user_domain_name'] = 'Default'
|
conf['placement']['user_domain_name'] = 'Default'
|
||||||
conf['placement']['project_domain_name'] = 'Default'
|
conf['placement']['project_domain_name'] = 'Default'
|
||||||
|
|
|
@ -134,7 +134,7 @@ describe 'openstack-compute::nova-common' do
|
||||||
it 'has correct authentication settings' do
|
it 'has correct authentication settings' do
|
||||||
[
|
[
|
||||||
'auth_type = password',
|
'auth_type = password',
|
||||||
'os_region_name = RegionOne',
|
'region_name = RegionOne',
|
||||||
'password = placement-pass',
|
'password = placement-pass',
|
||||||
'username = placement',
|
'username = placement',
|
||||||
'project_name = service',
|
'project_name = service',
|
||||||
|
|
Loading…
Reference in New Issue