Customizable auth_url, not hardwired to 127.0.0.1

This commit is contained in:
Eugene Kirpichov 2012-08-21 12:39:23 -07:00
parent 947b8c3b26
commit 0f98eb07ba
2 changed files with 12 additions and 1 deletions

View File

@ -19,6 +19,7 @@ describe 'glance::api' do
:registry_port => '9191',
:log_file => '/var/log/glance/api.log',
:auth_type => 'keystone',
:auth_uri => 'http://127.0.0.1:5000/',
:enabled => true
}
end
@ -33,6 +34,7 @@ describe 'glance::api' do
:registry_port => '9111',
:log_file => '/var/log/glance-api.log',
:auth_type => 'not_keystone',
:auth_uri => 'http://192.168.56.210:5000/',
:enabled => false
}
].each do |param_set|
@ -81,6 +83,15 @@ describe 'glance::api' do
)
end
it 'should use the proper auth_uri for glance-cache' do
verify_contents(
subject,
'/etc/glance/glance-cache.conf',
[
"auth_url = #{param_hash[:auth_uri]}"
]
)
end
end
end
end

View File

@ -38,7 +38,7 @@ registry_port = <%= registry_port %>
<% if auth_type == 'keystone' -%>
# Auth settings if using Keystone
auth_url = http://127.0.0.1:5000/v2.0/
auth_url = <%= auth_uri %>
admin_tenant_name = <%= keystone_tenant %>
admin_user = <%= keystone_user %>
admin_password = <%= keystone_password %>