gluster_volume: allow probing ourselves
We should allow "gluster peer probe" to determine if a given "host" maps to the localhost, and detect that case accordingly.
This commit is contained in:
parent
17b4efba22
commit
12bf504173
1 changed files with 3 additions and 5 deletions
|
@ -249,8 +249,8 @@ def wait_for_peer(host):
|
||||||
|
|
||||||
def probe(host, myhostname):
|
def probe(host, myhostname):
|
||||||
global module
|
global module
|
||||||
run_gluster([ 'peer', 'probe', host ])
|
out = run_gluster([ 'peer', 'probe', host ])
|
||||||
if not wait_for_peer(host):
|
if not out.find('localhost') and not wait_for_peer(host):
|
||||||
module.fail_json(msg='failed to probe peer %s on %s' % (host, myhostname))
|
module.fail_json(msg='failed to probe peer %s on %s' % (host, myhostname))
|
||||||
changed = True
|
changed = True
|
||||||
|
|
||||||
|
@ -258,9 +258,7 @@ def probe_all_peers(hosts, peers, myhostname):
|
||||||
for host in hosts:
|
for host in hosts:
|
||||||
host = host.strip() # Clean up any extra space for exact comparison
|
host = host.strip() # Clean up any extra space for exact comparison
|
||||||
if host not in peers:
|
if host not in peers:
|
||||||
# dont probe ourselves
|
probe(host, myhostname)
|
||||||
if myhostname != host:
|
|
||||||
probe(host, myhostname)
|
|
||||||
|
|
||||||
def create_volume(name, stripe, replica, transport, hosts, bricks, force):
|
def create_volume(name, stripe, replica, transport, hosts, bricks, force):
|
||||||
args = [ 'volume', 'create' ]
|
args = [ 'volume', 'create' ]
|
||||||
|
|
Loading…
Reference in a new issue