From 501ad27c0fe69c34ab39abf87a2b825b5a968e96 Mon Sep 17 00:00:00 2001
From: Kevin Chan <kevin@yinkei.com>
Date: Tue, 21 Feb 2012 16:17:54 +0800
Subject: [PATCH] Revert "[joyent|compute] make password required" This reverts
 commit 6e93321e29e69cc863aa9d78cdcf1c83203a2fa7.

The reason for reverting this is Joyent's CloudAPI allows authenticating using
either a username/password credential pair OR using a username and SSH private key.

In http-signature authentication scheme, no password is used.
---
 lib/fog/joyent/compute.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/fog/joyent/compute.rb b/lib/fog/joyent/compute.rb
index b6f2d4cf1..0dc486dfe 100644
--- a/lib/fog/joyent/compute.rb
+++ b/lib/fog/joyent/compute.rb
@@ -5,9 +5,12 @@ require 'multi_json'
 module Fog
   module Compute
     class Joyent < Fog::Service
-      requires   :joyent_password, :joyent_username
+      requires :joyent_username
 
-      recognizes :joyent_keyfile, :joyent_keyname, :joyent_url
+      recognizes :joyent_password
+      recognizes :joyent_url
+      recognizes :joyent_keyname
+      recognizes :joyent_keyfile
 
       model_path 'fog/joyent/models/compute'
       request_path 'fog/joyent/requests/compute'