From f923a9c28ff53548d013c28082005e7e0cd5c201 Mon Sep 17 00:00:00 2001
From: Monsyne Dragon <mdragon@rackspace.com>
Date: Thu, 3 Mar 2011 15:41:45 +0000
Subject: [PATCH] Add in multi-tenant support in openstack api.

---
 bin/nova-manage           | 3 +++
 nova/auth/novarc.template | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 89332f2a..8f8f0a6a 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -433,6 +433,8 @@ class ProjectCommands(object):
                     "been created.\nPlease create a database by running a "
                     "nova-api server on this host.")
 
+AccountCommands = ProjectCommands
+
 
 class FixedIpCommands(object):
     """Class for managing fixed ip."""
@@ -663,6 +665,7 @@ class VolumeCommands(object):
 
 CATEGORIES = [
     ('user', UserCommands),
+    ('account', AccountCommands),
     ('project', ProjectCommands),
     ('role', RoleCommands),
     ('shell', ShellCommands),
diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template
index cda2ecc2..1c917ad4 100644
--- a/nova/auth/novarc.template
+++ b/nova/auth/novarc.template
@@ -11,5 +11,5 @@ export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this se
 alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
 alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
 export NOVA_API_KEY="%(access)s"
-export NOVA_USERNAME="%(user)s"
+export NOVA_USERNAME="%(project)s:%(user)s"
 export NOVA_URL="%(os)s"