Permalink
Browse files

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.
  • Loading branch information...
1 parent adc2b93 commit 6c77769c8e75167b2d57c0a5e69d0d011497fcb8 Dan Bode committed Oct 31, 2012
Showing with 2 additions and 7 deletions.
  1. +0 −2 manifests/api.pp
  2. +2 −5 spec/classes/glance_api_spec.rb
View
2 manifests/api.pp
@@ -42,7 +42,6 @@
$auth_host = '127.0.0.1',
$auth_port = '35357',
$auth_protocol = 'http',
- $auth_url = "http://127.0.0.1:5000/",
$keystone_tenant = 'admin',
$keystone_user = 'admin',
$enabled = true,
@@ -124,7 +123,6 @@
'keystone_authtoken/auth_host': value => $auth_host;
'keystone_authtoken/auth_port': value => $auth_port;
'keystone_authtoken/protocol': value => $protocol;
- 'keystone_authtoken/auth_uri': value => $auth_uri;
}
# keystone config
View
7 spec/classes/glance_api_spec.rb
@@ -19,7 +19,6 @@
:registry_port => '9191',
:log_file => '/var/log/glance/api.log',
:auth_type => 'keystone',
- :auth_url => 'http://127.0.0.1:5000/',
:enabled => true,
:backlog => '4096',
:workers => '7',
@@ -44,7 +43,6 @@
:registry_port => '9111',
:log_file => '/var/log/glance-api.log',
:auth_type => 'not_keystone',
- :auth_url => 'http://192.168.56.210:5000/',
:enabled => false,
:backlog => '4095',
:workers => '5',
@@ -112,8 +110,7 @@
[
'auth_host',
'auth_port',
- 'protocol',
- 'auth_uri'
+ 'protocol'
].each do |config|
should contain_glance_api_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
end
@@ -125,7 +122,7 @@
['admin_tenant_name', 'admin_user', 'admin_password'].each do |config|
should contain_glance_api_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
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])
end
end

0 comments on commit 6c77769

Please sign in to comment.