Changes to auth

MattDietz · Jul 17, 2012 · 7460a51 · 7460a51
1 parent d0c5c5b
commit 7460a51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/yagi/auth.py b/yagi/auth.py
@@ -30,14 +30,13 @@ def rax_auth(conn, headers, force=False):
             return Auth.token
         user = yagi.config.get("handler_auth", "user")
         key = yagi.config.get("handler_auth", "key")
-        tenant = yagi.config.get("handler_auth", "tenant")
         auth_server = yagi.config.get("handler_auth", "auth_server")
-        req = httplib2.Http()
+        req = httplib2.Http(disable_ssl_certificate_validation=True)
         body = {"auth": {
-                    "RAX-KSKEY:apiKeyCredentials": {
+                    "passwordCredentials": {
                         "username": user,
-                        "apiKey": key,
-                        "tenantName": tenant}}}
+                        "password": key,
+                        }}}
         auth_headers = {}
         auth_headers["User-Agent"] = "Yagi"
         auth_headers["Accept"] = "application/json"

diff --git a/yagi/handler/atompub_handler.py b/yagi/handler/atompub_handler.py
@@ -52,7 +52,7 @@ def _send_notification(self, endpoint, puburl, headers, body, conn):
             msg = ("AtomPub Delivery Failed to %s with:\n%s" % (endpoint, e))
             raise MessageDeliveryFailed(msg)
 
-    def new_http_connection(force=False):
+    def new_http_connection(self, force=False):
         conn = http_util.LimitingBodyHttp()
         auth_method = yagi.auth.get_auth_method()
         headers = {}