diff --git a/manifests/api.pp b/manifests/api.pp index 2af39cab..f45c03e5 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -42,7 +42,6 @@ class glance::api( $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 @@ class glance::api( '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 diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb index cfd06bcf..960929a4 100644 --- a/spec/classes/glance_api_spec.rb +++ b/spec/classes/glance_api_spec.rb @@ -19,7 +19,6 @@ describe 'glance::api' do :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 @@ describe 'glance::api' do :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 @@ describe 'glance::api' do [ '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 @@ describe 'glance::api' do ['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