Merge with trunk.

4 files changed, 13 insertions, 13 deletions

diff --git a/bin/nova-api b/bin/nova-api
index 26f5dbc87..1f2009c30 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -29,7 +29,7 @@ from nova import flags
 from nova import rpc
 from nova import server
 from nova import utils
-from nova.auth import users
+from nova.auth import manager
 from nova.compute import model
 from nova.endpoint import admin
 from nova.endpoint import api
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index d15924e57..c519c6ccb 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -78,7 +78,7 @@ def main():
         FLAGS.network_size = 32
         FLAGS.fake_libvirt=True
         FLAGS.fake_network=True
-        FLAGS.fake_users = True
+        FLAGS.auth_driver='nova.auth.ldapdriver.FakeLdapDriver'
     action = argv[1]
     if action in ['add','del','old']:
         mac = argv[2]
diff --git a/bin/nova-manage b/bin/nova-manage
index 56f89ce30..b0f0029ed 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -27,7 +27,7 @@ import time
 
 from nova import flags
 from nova import utils
-from nova.auth import users
+from nova.auth import manager
 from nova.compute import model
 from nova.compute import network
 from nova.cloudpipe import pipelib
@@ -42,7 +42,7 @@ class NetworkCommands(object):
 
 class VpnCommands(object):
     def __init__(self):
-        self.manager = users.UserManager.instance()
+        self.manager = manager.AuthManager()
         self.instdir = model.InstanceDirectory()
         self.pipe = pipelib.CloudPipe(cloud.CloudController())
 
@@ -90,7 +90,7 @@ class VpnCommands(object):
 
 class RoleCommands(object):
     def __init__(self):
-        self.manager = users.UserManager.instance()
+        self.manager = manager.AuthManager()
 
     def add(self, user, role, project=None):
         """adds role to user
@@ -113,7 +113,7 @@ class RoleCommands(object):
 
 class UserCommands(object):
     def __init__(self):
-        self.manager = users.UserManager.instance()
+        self.manager = manager.AuthManager()
 
     def __print_export(self, user):
         print 'export EC2_ACCESS_KEY=%s' % user.access
@@ -153,7 +153,7 @@ class UserCommands(object):
 
 class ProjectCommands(object):
     def __init__(self):
-        self.manager = users.UserManager.instance()
+        self.manager = manager.AuthManager()
 
     def add(self, project, user):
         """adds user to project
diff --git a/bin/nova-rsapi b/bin/nova-rsapi
index 5cbe2d8c1..306a1fc60 100755
--- a/bin/nova-rsapi
+++ b/bin/nova-rsapi
@@ -4,20 +4,20 @@
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
-# 
+#
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
 #    You may obtain a copy of the License at
-# 
+#
 #        http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 #    Unless required by applicable law or agreed to in writing, software
 #    distributed under the License is distributed on an "AS IS" BASIS,
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 """
-  WSGI daemon for the main API endpoint.  
+  WSGI daemon for the main API endpoint.
 """
 
 import logging
@@ -28,14 +28,14 @@ from nova import flags
 from nova import rpc
 from nova import server
 from nova import utils
-from nova.auth import users
+from nova.auth import manager
 from nova.endpoint import rackspace
 
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('cc_port', 8773, 'cloud controller port')
 
 def main(_argv):
-    user_manager = users.UserManager()
+    user_manager = manager.AuthManager()
     api_instance = rackspace.Api(user_manager)
     conn = rpc.Connection.instance()
     rpc_consumer = rpc.AdapterConsumer(connection=conn,