From a96fb6fab904630953515ed753cf40e02aad8710 Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Fri, 20 Jun 2014 10:23:45 -0500
Subject: [PATCH] Use new shared rax_to_dict and normalize the services key
 into something that makes sense

---
 cloud/rax_identity | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cloud/rax_identity b/cloud/rax_identity
index 9de4db96611..ea40ea2ef46 100644
--- a/cloud/rax_identity
+++ b/cloud/rax_identity
@@ -65,10 +65,8 @@ def cloud_identity(module, state, identity):
     )
     changed = False
 
-    for key, value in vars(identity).iteritems():
-        if (isinstance(value, NON_CALLABLES) and
-                not key.startswith('_')):
-            instance[key] = value
+    instance.update(rax_to_dict(identity))
+    instance['services'] = instance.get('services', {}).keys()
 
     if state == 'present':
         if not identity.authenticated: