Merge lp:~letterj/swift/auth2swauth into lp:~hudson-openstack/swift/trunk

[Jay Payne]

Simple change to the swift-auth-to-swauth utility to only list out the commands for converting accounts to from auth to swauth.

A later fix would be to actually run the commands on the new swauth server.

[Chuck Thier (cthier)]

ok

review: Approve

=== modified file 'bin/swift-auth-to-swauth'
--- bin/swift-auth-to-swauth	2011-01-19 23:21:57 +0000
+++ bin/swift-auth-to-swauth	2011-01-27 23:18:57 +0000
@@ -26,7 +26,8 @@
     if len(argv) != 4 or argv[1] != '-K':
         exit('Syntax: %s -K <super_admin_key> <path to auth.db>' % argv[0])
     _junk, _junk, super_admin_key, auth_db = argv
-    call(['swauth-prep', '-K', super_admin_key])
+    # This version will not attempt to prep swauth
+    # call(['swauth-prep', '-K', super_admin_key])
     conn = sqlite3.connect(auth_db)
     for account, cfaccount, user, password, admin, reseller_admin in \
             conn.execute('SELECT account, cfaccount, user, password, admin, '
@@ -39,7 +40,8 @@
             cmd.append('-r')
         cmd.extend([account, user, password])
         print ' '.join(cmd)
-        call(cmd)
+	# For this version, the script will only print out the commands
+        # call(cmd)
     print '----------------------------------------------------------------'
     print ' Assuming the above worked perfectly, you should copy and paste '
     print ' those lines into your ~/bin/recreateaccounts script.'