From 7fed89b51d7a4aa4c3fbad29400bd1ec7848f8cf Mon Sep 17 00:00:00 2001
From: Marco Vito Moscaritolo <mavimo@gmail.com>
Date: Tue, 9 Oct 2012 21:43:58 +0200
Subject: [PATCH] Improved RackSpace configuration support (needed by latest
 version of rackspace API)

---
 plugins/inventory/nova.ini | 12 ++++++++----
 plugins/inventory/nova.py  |  4 +++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/inventory/nova.ini b/plugins/inventory/nova.ini
index e91136d358..e648e5f143 100644
--- a/plugins/inventory/nova.ini
+++ b/plugins/inventory/nova.ini
@@ -11,16 +11,20 @@ username      =
 api_key       =
 
 # OpenStack nova auth_url
-# For use with the new RackSpace API use https://identity.api.rackspacecloud.com/v2.0/
 auth_url      =
 
+# Authentication system
+auth_system =
+
 # OpenStack nova project_id
-project_id    = None
+project_id    = 
+
+# Serverarm region name to use
+region_name   =
 
 # TODO: Some other options
 # insecure      =
-# region_name   =
 # endpoint_type =
-# extensions    = 
+# extensions    =
 # service_type  =
 # service_name  =
diff --git a/plugins/inventory/nova.py b/plugins/inventory/nova.py
index cbe5c72f88..eec2f2feec 100755
--- a/plugins/inventory/nova.py
+++ b/plugins/inventory/nova.py
@@ -99,7 +99,9 @@ client = nova_client.Client(
     username    = config.get('openstack', 'username'),
     api_key     = config.get('openstack', 'api_key'),
     auth_url    = config.get('openstack', 'auth_url'),
-    project_id  = config.get('openstack', 'project_id')
+    region_name = config.get('openstack', 'region_name'),
+    project_id  = config.get('openstack', 'project_id'),
+    auth_system = config.get('openstack', 'auth_system')
 )
 
 if len(sys.argv) == 2 and (sys.argv[1] == '--list'):