openstack/swift
Code Issues Proposed changes

Commit out the both calls

Browse Source
This commit is contained in:
Jay Payne
2011-01-27 20:23:14 +00:00
parent d1f3dfb4ef
commit c3c5e5a397
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/swift-auth-to-swauth
View File

@@ -26,7 +26,8 @@ if __name__ == '__main__':
if len(argv) != 4 or argv[1] != '-K': if len(argv) != 4 or argv[1] != '-K':
exit('Syntax: %s -K <super_admin_key> <path to auth.db>' % argv[0]) exit('Syntax: %s -K <super_admin_key> <path to auth.db>' % argv[0])
_junk, _junk, super_admin_key, auth_db = argv _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) conn = sqlite3.connect(auth_db)
for account, cfaccount, user, password, admin, reseller_admin in \ for account, cfaccount, user, password, admin, reseller_admin in \
conn.execute('SELECT account, cfaccount, user, password, admin, ' conn.execute('SELECT account, cfaccount, user, password, admin, '
@@ -39,7 +40,8 @@ if __name__ == '__main__':
cmd.append('-r') cmd.append('-r')
cmd.extend([account, user, password]) cmd.extend([account, user, password])
print ' '.join(cmd) print ' '.join(cmd)
call(cmd) # For this version, the script will only print out the commands
# call(cmd)
print '----------------------------------------------------------------' print '----------------------------------------------------------------'
print ' Assuming the above worked perfectly, you should copy and paste ' print ' Assuming the above worked perfectly, you should copy and paste '
print ' those lines into your ~/bin/recreateaccounts script.' print ' those lines into your ~/bin/recreateaccounts script.'