From a430f89563b518bf1d6a00941202aedaa2928c5b Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Thu, 30 Jan 2014 07:59:31 -0700
Subject: [PATCH 1/2] Update docs for rax_facts to include parameters added for
 other OpenStack clouds

---
 cloud/rax_facts | 60 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/cloud/rax_facts b/cloud/rax_facts
index b4cb0c978ff..d1cd3056e86 100644
--- a/cloud/rax_facts
+++ b/cloud/rax_facts
@@ -22,33 +22,63 @@ description:
      - Gather facts for Rackspace Cloud Servers.
 version_added: "1.4"
 options:
-  address:
-    description:
-      - Server IP address to retrieve facts for, will match any IP assigned to
-        the server
   api_key:
     description:
-      - Rackspace API key (overrides C(credentials))
+      - Rackspace API key (overrides I(credentials))
+    aliases:
+      - password
+  auth_endpoint:
+    description:
+      - The URI of the authentication service
+    default: https://identity.api.rackspacecloud.com/v2.0/
+    version_added: 1.5
   credentials:
     description:
-      - File to find the Rackspace credentials in (ignored if C(api_key) and
-        C(username) are provided)
+      - File to find the Rackspace credentials in (ignored if I(api_key) and
+        I(username) are provided)
     default: null
-    aliases: ['creds_file']
-  id:
+    aliases:
+      - creds_file
+  env:
     description:
-      - Server ID to retrieve facts for
-  name:
+      - Environment as configured in ~/.pyrax.cfg,
+        see https://github.com/rackspace/pyrax/blob/master/docs/getting_started.md#pyrax-configuration
+    version_added: 1.5
+  identity_type:
     description:
-      - Server name to retrieve facts for
-    default: null
+      - Authentication machanism to use, such as rackspace or keystone
+    default: rackspace
+    version_added: 1.5
   region:
     description:
-      - Region to retrieve facts for
+      - Region to create an instance in
     default: DFW
+  tenant_id:
+    description:
+      - The tenant ID used for authentication
+    version_added: 1.5
+  tenant_name:
+    description:
+      - The tenant name used for authentication
+    version_added: 1.5
   username:
     description:
-      - Rackspace username (overrides C(credentials))
+      - Rackspace username (overrides I(credentials))
+  verify_ssl:
+    description:
+      - Whether or not to require SSL validation of API endpoints
+    version_added: 1.5
+  address:
+    description:
+      - Server IP address to retrieve facts for, will match any IP assigned to
+        the server
+  id:
+    description:
+      - Server ID to retrieve facts for
+  name:
+    description:
+      - Server name to retrieve facts for
+    default: null
 requirements: [ "pyrax" ]
 author: Matt Martz
 notes:

From 535e82ed26596013da522a6a0b0e0f41f9ee823d Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Tue, 11 Feb 2014 14:25:13 -0600
Subject: [PATCH 2/2] The OpenStack auth attributes apply to rax_keypair also

---
 cloud/rax_keypair | 52 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/cloud/rax_keypair b/cloud/rax_keypair
index 0df4ceb73a4..bd5270b9e3d 100644
--- a/cloud/rax_keypair
+++ b/cloud/rax_keypair
@@ -24,13 +24,50 @@ version_added: 1.5
 options:
   api_key:
     description:
-      - Rackspace API key (overrides C(credentials))
+      - Rackspace API key (overrides I(credentials))
+    aliases:
+      - password
+  auth_endpoint:
+    description:
+      - The URI of the authentication service
+    default: https://identity.api.rackspacecloud.com/v2.0/
+    version_added: 1.5
   credentials:
     description:
-      - File to find the Rackspace credentials in (ignored if C(api_key) and
-        C(username) are provided)
+      - File to find the Rackspace credentials in (ignored if I(api_key) and
+        I(username) are provided)
     default: null
-    aliases: ['creds_file']
+    aliases:
+      - creds_file
+  env:
+    description:
+      - Environment as configured in ~/.pyrax.cfg,
+        see https://github.com/rackspace/pyrax/blob/master/docs/getting_started.md#pyrax-configuration
+    version_added: 1.5
+  identity_type:
+    description:
+      - Authentication machanism to use, such as rackspace or keystone
+    default: rackspace
+    version_added: 1.5
+  region:
+    description:
+      - Region to create an instance in
+    default: DFW
+  tenant_id:
+    description:
+      - The tenant ID used for authentication
+    version_added: 1.5
+  tenant_name:
+    description:
+      - The tenant name used for authentication
+    version_added: 1.5
+  username:
+    description:
+      - Rackspace username (overrides I(credentials))
+  verify_ssl:
+    description:
+      - Whether or not to require SSL validation of API endpoints
+    version_added: 1.5
   name:
     description:
       - Name of keypair
@@ -39,13 +76,6 @@ options:
     description:
       - Public Key string to upload
     default: null
-  region:
-    description:
-      - Region to create the key pair in
-    default: DFW
-  username:
-    description:
-      - Rackspace username (overrides C(credentials))
   state:
     description:
       - Indicate desired state of the resource