From e56832c138bcfe5d7089300c09e707e4ba502121 Mon Sep 17 00:00:00 2001
From: Ilya Kharin <ikharin@mirantis.com>
Date: Sat, 16 Mar 2013 12:16:54 +0400
Subject: [PATCH] Fix format device
Change-Id: Icef35175682c11a406ef85accc6c6e1acbf89f4d
---
bin/swift-ring-builder | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/swift-ring-builder b/bin/swift-ring-builder
index ef86729ffa..0d636f620a 100755
--- a/bin/swift-ring-builder
+++ b/bin/swift-ring-builder
@@ -41,10 +41,10 @@ def format_device(dev):
Format a device for display.
"""
if ':' in dev['ip']:
- return ('d%(id)sr%(region)z%(zone)s-'
+ return ('d%(id)sr%(region)sz%(zone)s-'
'[%(ip)s]:%(port)s/%(device)s_"%(meta)s"') % dev
else:
- return ('d%(id)sr%(region)z%(zone)s-'
+ return ('d%(id)sr%(region)sz%(zone)s-'
'%(ip)s:%(port)s/%(device)s_"%(meta)s"') % dev
@@ -471,7 +471,7 @@ swift-ring-builder <builder_file> remove <search-value> [search-value ...]
if len(devs) > 1:
print 'Matched more than one device:'
for dev in devs:
- print ' d%(id)sr%(region)z%(zone)s-%(ip)s:%(port)s/' \
+ print ' d%(id)sr%(region)sz%(zone)s-%(ip)s:%(port)s/' \
'%(device)s_"%(meta)s"' % dev
if raw_input('Are you sure you want to remove these %s '
'devices? (y/N) ' % len(devs)) != 'y':
@@ -494,7 +494,7 @@ swift-ring-builder <builder_file> remove <search-value> [search-value ...]
print '-' * 79
exit(EXIT_ERROR)
- print 'd%(id)sr%(region)z%(zone)s-%(ip)s:%(port)s/' \
+ print 'd%(id)sr%(region)sz%(zone)s-%(ip)s:%(port)s/' \
'%(device)s_"%(meta)s" marked for removal and will ' \
'be removed next rebalance.' % dev
pickle.dump(builder.to_dict(), open(argv[1], 'wb'), protocol=2)