Fix os_region_name in provider
Commit e6e8f6a562
changed the section
where the os_region_name setting is placed from 'DEFAULT' to
'glance_store'. However, the provider was not updated to reflect
this change, so it broke.
Change-Id: I9e91faac2a45ac4eba4cc27c328e8dc67e619ab3
This commit is contained in:
parent
3f07c87f88
commit
354ae692a5
|
@ -16,7 +16,7 @@ class Puppet::Provider::Glance < Puppet::Provider
|
|||
glance_file['keystone_authtoken']['admin_tenant_name'] and
|
||||
glance_file['keystone_authtoken']['admin_user'] and
|
||||
glance_file['keystone_authtoken']['admin_password'] and
|
||||
glance_file['DEFAULT']['os_region_name']
|
||||
glance_file['glance_store']['os_region_name']
|
||||
|
||||
g = {}
|
||||
g['auth_host'] = glance_file['keystone_authtoken']['auth_host'].strip
|
||||
|
@ -25,7 +25,7 @@ class Puppet::Provider::Glance < Puppet::Provider
|
|||
g['admin_tenant_name'] = glance_file['keystone_authtoken']['admin_tenant_name'].strip
|
||||
g['admin_user'] = glance_file['keystone_authtoken']['admin_user'].strip
|
||||
g['admin_password'] = glance_file['keystone_authtoken']['admin_password'].strip
|
||||
g['os_region_name'] = glance_file['DEFAULT']['os_region_name'].strip
|
||||
g['os_region_name'] = glance_file['glance_store']['os_region_name'].strip
|
||||
|
||||
# auth_admin_prefix not required to be set.
|
||||
g['auth_admin_prefix'] = (glance_file['keystone_authtoken']['auth_admin_prefix'] || '').strip
|
||||
|
@ -36,14 +36,14 @@ class Puppet::Provider::Glance < Puppet::Provider
|
|||
glance_file['keystone_authtoken']['admin_tenant_name'] and
|
||||
glance_file['keystone_authtoken']['admin_user'] and
|
||||
glance_file['keystone_authtoken']['admin_password'] and
|
||||
glance_file['DEFAULT']['os_region_name']
|
||||
glance_file['glance_store']['os_region_name']
|
||||
|
||||
g = {}
|
||||
g['identity_uri'] = glance_file['keystone_authtoken']['identity_uri'].strip
|
||||
g['admin_tenant_name'] = glance_file['keystone_authtoken']['admin_tenant_name'].strip
|
||||
g['admin_user'] = glance_file['keystone_authtoken']['admin_user'].strip
|
||||
g['admin_password'] = glance_file['keystone_authtoken']['admin_password'].strip
|
||||
g['os_region_name'] = glance_file['DEFAULT']['os_region_name'].strip
|
||||
g['os_region_name'] = glance_file['glance_store']['os_region_name'].strip
|
||||
|
||||
return g
|
||||
else
|
||||
|
|
|
@ -36,7 +36,7 @@ describe Puppet::Provider::Glance do
|
|||
'admin_user' => 'user',
|
||||
'admin_password' => 'pass'
|
||||
},
|
||||
'DEFAULT' =>
|
||||
'glance_store' =>
|
||||
{
|
||||
'os_region_name' => 'SomeRegion',
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue