openstack/openstack-ansible
Code Issues Proposed changes

Merge pull request #569 from andymcc/repl_ring_fix

Browse Source 
Set replication network without replication port
This commit is contained in:
Andy McCrae 2014-11-19 11:05:06 +00:00
commit 71068eafd4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpc_deployment/roles/swift_ring_builder/templates/swift_rings.py
View File

@ -133,9 +133,14 @@ def add_host_to_ring(build_file, host, validate=False):
host_str += 'r%(region)d' % host host_str += 'r%(region)d' % host
host_str += "z%d" % (host.get('zone', DEFAULT_HOST_ZONE)) host_str += "z%d" % (host.get('zone', DEFAULT_HOST_ZONE))
host_str += "-%(ip)s:%(port)d" % host host_str += "-%(ip)s:%(port)d" % host
if host.get('repl_port'): if host.get('repl_ip'):
r_ip = host['repl_ip']
r_port = host.get('repl_port', host['port'])
host_str += "R%s:%d" % (r_ip, r_port)
elif host.get('repl_port'):
r_ip = host.get('repl_ip', host['ip']) r_ip = host.get('repl_ip', host['ip'])
host_str += "R%s:%d" % (r_ip, host['repl_port']) r_port = host['repl_port']
host_str += "R%s:%d" % (r_ip, r_port)
host_str += "/%(name)s" % host host_str += "/%(name)s" % host
weight = host.get('weight', DEFAULT_HOST_WEIGHT) weight = host.get('weight', DEFAULT_HOST_WEIGHT)
except Exception as ex: except Exception as ex: