Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit 6c77769c8e75167b2d57c0a5e69d0d011497fcb8 1 parent adc2b93
Dan Bode authored October 31, 2012
2  manifests/api.pp
@@ -42,7 +42,6 @@
42 42
   $auth_host         = '127.0.0.1',
43 43
   $auth_port         = '35357',
44 44
   $auth_protocol     = 'http',
45  
-  $auth_url          = "http://127.0.0.1:5000/",
46 45
   $keystone_tenant   = 'admin',
47 46
   $keystone_user     = 'admin',
48 47
   $enabled           = true,
@@ -124,7 +123,6 @@
124 123
     'keystone_authtoken/auth_host':         value => $auth_host;
125 124
     'keystone_authtoken/auth_port':         value => $auth_port;
126 125
     'keystone_authtoken/protocol':          value => $protocol;
127  
-    'keystone_authtoken/auth_uri':          value => $auth_uri;
128 126
   }
129 127
 
130 128
   # keystone config
7  spec/classes/glance_api_spec.rb
@@ -19,7 +19,6 @@
19 19
       :registry_port     => '9191',
20 20
       :log_file          => '/var/log/glance/api.log',
21 21
       :auth_type         => 'keystone',
22  
-      :auth_url          => 'http://127.0.0.1:5000/',
23 22
       :enabled           => true,
24 23
       :backlog           => '4096',
25 24
       :workers           => '7',
@@ -44,7 +43,6 @@
44 43
       :registry_port     => '9111',
45 44
       :log_file          => '/var/log/glance-api.log',
46 45
       :auth_type         => 'not_keystone',
47  
-      :auth_url          => 'http://192.168.56.210:5000/',
48 46
       :enabled           => false,
49 47
       :backlog           => '4095',
50 48
       :workers           => '5',
@@ -112,8 +110,7 @@
112 110
         [
113 111
           'auth_host',
114 112
           'auth_port',
115  
-          'protocol',
116  
-          'auth_uri'
  113
+          'protocol'
117 114
         ].each do |config|
118 115
           should contain_glance_api_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
119 116
         end
@@ -125,7 +122,7 @@
125 122
           ['admin_tenant_name', 'admin_user', 'admin_password'].each do |config|
126 123
             should contain_glance_api_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
127 124
           end
128  
-          ['admin_tenant_name', 'admin_user', 'admin_password', 'auth_url'].each do |config|
  125
+          ['admin_tenant_name', 'admin_user', 'admin_password'].each do |config|
129 126
             should contain_glance_cache_config("keystone_authtoken/#{config}").with_value(param_hash[config.intern])
130 127
           end
131 128
         end

0 notes on commit 6c77769

Please sign in to comment.
Something went wrong with that request. Please try again.