summaryrefslogtreecommitdiffstats
path: root/nova/cloudpipe
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-07-19 13:19:26 -0500
committerVishvananda Ishaya <vishvananda@gmail.com>2010-07-19 13:19:26 -0500
commita3ca587654095ffd4b97103302fb0744e505e332 (patch)
tree5e7ef9e1e7fc7f35ca7c216ebfffea958c9d4d58 /nova/cloudpipe
parentb09e69c5579526fcc1a08c7e3c3a3c880fa09297 (diff)
downloadnova-a3ca587654095ffd4b97103302fb0744e505e332.tar.gz
nova-a3ca587654095ffd4b97103302fb0744e505e332.tar.xz
nova-a3ca587654095ffd4b97103302fb0744e505e332.zip
Massive refactor of users.py
Split users.py into manager.py and ldpadriver.py Added tons of docstrings Cleaned up public methods Simplified manager singleton handling
Diffstat (limited to 'nova/cloudpipe')
-rw-r--r--nova/cloudpipe/api.py2
-rw-r--r--nova/cloudpipe/pipelib.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/cloudpipe/api.py b/nova/cloudpipe/api.py
index a5f78a16d..0bffe9aa3 100644
--- a/nova/cloudpipe/api.py
+++ b/nova/cloudpipe/api.py
@@ -25,7 +25,7 @@ import tornado.web
import urllib
from nova import crypto
-from nova.auth import users
+from nova.auth import manager
_log = logging.getLogger("api")
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py
index 63f7ae222..5b0ed3471 100644
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@@ -31,7 +31,7 @@ import zipfile
from nova import exception
from nova import flags
from nova import utils
-from nova.auth import users
+from nova.auth import manager
from nova.endpoint import api
@@ -44,7 +44,7 @@ flags.DEFINE_string('boot_script_template',
class CloudPipe(object):
def __init__(self, cloud_controller):
self.controller = cloud_controller
- self.manager = users.UserManager.instance()
+ self.manager = manager.AuthManager()
def launch_vpn_instance(self, project_id):
logging.debug( "Launching VPN for %s" % (project_id))