Skip to content

Commit

Permalink
Merge pull request #13984 from rook/mergify/bp/release-1.13/pr-13982
Browse files Browse the repository at this point in the history
external: fix v2 port check in external script (backport #13982)
  • Loading branch information
travisn committed Mar 27, 2024
2 parents 03030a2 + 94d410c commit a306993
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions deploy/examples/create-external-cluster-resources.py
Expand Up @@ -702,11 +702,10 @@ def get_ceph_external_mon_data(self):
ip_addr = str(q_leader_details["public_addr"].split("/")[0])

if self._arg_parser.v2_port_enable:
if len(q_leader_addrvec) > 1:
if q_leader_addrvec[0]["type"] == "v2":
ip_addr = q_leader_addrvec[0]["addr"]
elif q_leader_addrvec[1]["type"] == "v2":
ip_addr = q_leader_addrvec[1]["addr"]
if q_leader_addrvec[0]["type"] == "v2":
ip_addr = q_leader_addrvec[0]["addr"]
elif len(q_leader_addrvec) > 1 and q_leader_addrvec[1]["type"] == "v2":
ip_addr = q_leader_addrvec[1]["addr"]
else:
sys.stderr.write(
"'v2' address type not present, and 'v2-port-enable' flag is provided"
Expand Down

0 comments on commit a306993

Please sign in to comment.