remove auth_url param
This commit removes the auth_url class param I search of glance's source code indicates that this parameter is not used anywhere except by something in the tools directory.
This commit is contained in:
parent
adc2b9319b
commit
6c77769c8e
|
@ -42,7 +42,6 @@ class glance::api(
|
||||||
$auth_host = '127.0.0.1',
|
$auth_host = '127.0.0.1',
|
||||||
$auth_port = '35357',
|
$auth_port = '35357',
|
||||||
$auth_protocol = 'http',
|
$auth_protocol = 'http',
|
||||||
$auth_url = "http://127.0.0.1:5000/",
|
|
||||||
$keystone_tenant = 'admin',
|
$keystone_tenant = 'admin',
|
||||||
$keystone_user = 'admin',
|
$keystone_user = 'admin',
|
||||||
$enabled = true,
|
$enabled = true,
|
||||||
|
@ -124,7 +123,6 @@ class glance::api(
|
||||||
'keystone_authtoken/auth_host': value => $auth_host;
|
'keystone_authtoken/auth_host': value => $auth_host;
|
||||||
'keystone_authtoken/auth_port': value => $auth_port;
|
'keystone_authtoken/auth_port': value => $auth_port;
|
||||||
'keystone_authtoken/protocol': value => $protocol;
|
'keystone_authtoken/protocol': value => $protocol;
|
||||||
'keystone_authtoken/auth_uri': value => $auth_uri;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# keystone config
|
# keystone config
|
||||||
|
|
|
@ -19,7 +19,6 @@ describe 'glance::api' do
|
||||||
:registry_port => '9191',
|
:registry_port => '9191',
|
||||||
:log_file => '/var/log/glance/api.log',
|
:log_file => '/var/log/glance/api.log',
|
||||||
:auth_type => 'keystone',
|
:auth_type => 'keystone',
|
||||||
:auth_url => 'http://127.0.0.1:5000/',
|
|
||||||
:enabled => true,
|
:enabled => true,
|
||||||
:backlog => '4096',
|
:backlog => '4096',
|
||||||
:workers => '7',
|
:workers => '7',
|
||||||
|
@ -44,7 +43,6 @@ describe 'glance::api' do
|
||||||
:registry_port => '9111',
|
:registry_port => '9111',
|
||||||
:log_file => '/var/log/glance-api.log',
|
:log_file => '/var/log/glance-api.log',
|
||||||
:auth_type => 'not_keystone',
|
:auth_type => 'not_keystone',
|
||||||
:auth_url => 'http://192.168.56.210:5000/',
|
|
||||||
:enabled => false,
|
:enabled => false,
|
||||||
:backlog => '4095',
|
:backlog => '4095',
|
||||||
:workers => '5',
|
:workers => '5',
|
||||||
|
@ -112,8 +110,7 @@ describe 'glance::api' do
|
||||||
[
|
[
|
||||||
'auth_host',
|
'auth_host',
|
||||||
'auth_port',
|
'auth_port',
|
||||||
'protocol',
|
'protocol'
|
||||||
'auth_uri'
|
|
||||||
].each do |config|
|
].each do |config|
|
||||||
should contain_glance_api_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
|
should contain_glance_api_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
|
||||||
end
|
end
|
||||||
|
@ -125,7 +122,7 @@ describe 'glance::api' do
|
||||||
['admin_tenant_name', 'admin_user', 'admin_password'].each do |config|
|
['admin_tenant_name', 'admin_user', 'admin_password'].each do |config|
|
||||||
should contain_glance_api_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
|
should contain_glance_api_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
|
||||||
end
|
end
|
||||||
['admin_tenant_name', 'admin_user', 'admin_password', 'auth_url'].each do |config|
|
['admin_tenant_name', 'admin_user', 'admin_password'].each do |config|
|
||||||
should contain_glance_cache_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
|
should contain_glance_cache_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue