From 201b357b278964a068bd1667deb905b146582513 Mon Sep 17 00:00:00 2001 From: parth-gr Date: Tue, 8 Oct 2024 17:51:49 +0530 Subject: [PATCH] external: enable the v2 port by default in downstream for 4.18 we will use the default v2 settings from the cluster CR So ask python script to fetch only v2 port Signed-off-by: parth-gr --- .../create-external-cluster-resources.py | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/deploy/examples/create-external-cluster-resources.py b/deploy/examples/create-external-cluster-resources.py index 268176c4f607e..55a1d2712c0b0 100644 --- a/deploy/examples/create-external-cluster-resources.py +++ b/deploy/examples/create-external-cluster-resources.py @@ -79,22 +79,22 @@ def _init_cmd_output_map(self): ) as json_file: ceph_status_str = json_file.read() self.cmd_names["fs ls"] = """{"format": "json", "prefix": "fs ls"}""" - self.cmd_names["quorum_status"] = ( - """{"format": "json", "prefix": "quorum_status"}""" - ) - self.cmd_names["mgr services"] = ( - """{"format": "json", "prefix": "mgr services"}""" - ) + self.cmd_names[ + "quorum_status" + ] = """{"format": "json", "prefix": "quorum_status"}""" + self.cmd_names[ + "mgr services" + ] = """{"format": "json", "prefix": "mgr services"}""" # all the commands and their output - self.cmd_output_map[self.cmd_names["fs ls"]] = ( - """[{"name":"myfs","metadata_pool":"myfs-metadata","metadata_pool_id":2,"data_pool_ids":[3],"data_pools":["myfs-replicated"]}]""" - ) - self.cmd_output_map[self.cmd_names["quorum_status"]] = ( - """{"election_epoch":3,"quorum":[0],"quorum_names":["a"],"quorum_leader_name":"a","quorum_age":14385,"features":{"quorum_con":"4540138292836696063","quorum_mon":["kraken","luminous","mimic","osdmap-prune","nautilus","octopus"]},"monmap":{"epoch":1,"fsid":"af4e1673-0b72-402d-990a-22d2919d0f1c","modified":"2020-05-07T03:36:39.918035Z","created":"2020-05-07T03:36:39.918035Z","min_mon_release":15,"min_mon_release_name":"octopus","features":{"persistent":["kraken","luminous","mimic","osdmap-prune","nautilus","octopus"],"optional":[]},"mons":[{"rank":0,"name":"a","public_addrs":{"addrvec":[{"type":"v2","addr":"10.110.205.174:3300","nonce":0},{"type":"v1","addr":"10.110.205.174:6789","nonce":0}]},"addr":"10.110.205.174:6789/0","public_addr":"10.110.205.174:6789/0","priority":0,"weight":0}]}}""" - ) - self.cmd_output_map[self.cmd_names["mgr services"]] = ( - """{"dashboard":"https://ceph-dashboard:8443/","prometheus":"http://ceph-dashboard-db:9283/"}""" - ) + self.cmd_output_map[ + self.cmd_names["fs ls"] + ] = """[{"name":"myfs","metadata_pool":"myfs-metadata","metadata_pool_id":2,"data_pool_ids":[3],"data_pools":["myfs-replicated"]}]""" + self.cmd_output_map[ + self.cmd_names["quorum_status"] + ] = """{"election_epoch":3,"quorum":[0],"quorum_names":["a"],"quorum_leader_name":"a","quorum_age":14385,"features":{"quorum_con":"4540138292836696063","quorum_mon":["kraken","luminous","mimic","osdmap-prune","nautilus","octopus"]},"monmap":{"epoch":1,"fsid":"af4e1673-0b72-402d-990a-22d2919d0f1c","modified":"2020-05-07T03:36:39.918035Z","created":"2020-05-07T03:36:39.918035Z","min_mon_release":15,"min_mon_release_name":"octopus","features":{"persistent":["kraken","luminous","mimic","osdmap-prune","nautilus","octopus"],"optional":[]},"mons":[{"rank":0,"name":"a","public_addrs":{"addrvec":[{"type":"v2","addr":"10.110.205.174:3300","nonce":0},{"type":"v1","addr":"10.110.205.174:6789","nonce":0}]},"addr":"10.110.205.174:6789/0","public_addr":"10.110.205.174:6789/0","priority":0,"weight":0}]}}""" + self.cmd_output_map[ + self.cmd_names["mgr services"] + ] = """{"dashboard":"https://ceph-dashboard:8443/","prometheus":"http://ceph-dashboard-db:9283/"}""" self.cmd_output_map[ """{"caps": ["mon", "allow r, allow command quorum_status", "osd", "profile rbd-read-only, allow rwx pool=default.rgw.meta, allow r pool=.rgw.root, allow rw pool=default.rgw.control, allow x pool=default.rgw.buckets.index", "mds", "allow *"], "entity": "client.healthchecker", "format": "json", "prefix": "auth get-or-create"}""" ] = """[{"entity":"client.healthchecker","key":"AQDFkbNeft5bFRAATndLNUSEKruozxiZi3lrdA==","caps":{"mon":"allow r, allow command quorum_status","osd":"profile rbd-read-only, allow rwx pool=default.rgw.meta, allow r pool=.rgw.root, allow rw pool=default.rgw.control, allow x pool=default.rgw.buckets.index","mds":"allow *"}}]""" @@ -122,9 +122,9 @@ def _init_cmd_output_map(self): self.cmd_output_map[ """{"caps": ["mon", "allow r, allow command quorum_status, allow command version", "mgr", "allow command config", "osd", "profile rbd-read-only, allow rwx pool=default.rgw.meta, allow r pool=.rgw.root, allow rw pool=default.rgw.control, allow rx pool=default.rgw.log, allow x pool=default.rgw.buckets.index", "mds", "allow *"], "entity": "client.healthchecker", "format": "json", "prefix": "auth caps"}""" ] = """[{"entity":"client.healthchecker","key":"AQDFkbNeft5bFRAATndLNUSRKruozxiZi3lrdA==","caps":{"mon": "allow r, allow command quorum_status, allow command version", "mgr": "allow command config", "osd": "profile rbd-read-only, allow rwx pool=default.rgw.meta, allow r pool=.rgw.root, allow rw pool=default.rgw.control, allow rx pool=default.rgw.log, allow x pool=default.rgw.buckets.index","mds":"allow *"}}]""" - self.cmd_output_map["""{"format": "json", "prefix": "mgr services"}"""] = ( - """{"dashboard": "http://rook-ceph-mgr-a-57cf9f84bc-f4jnl:7000/", "prometheus": "http://rook-ceph-mgr-a-57cf9f84bc-f4jnl:9283/"}""" - ) + self.cmd_output_map[ + """{"format": "json", "prefix": "mgr services"}""" + ] = """{"dashboard": "http://rook-ceph-mgr-a-57cf9f84bc-f4jnl:7000/", "prometheus": "http://rook-ceph-mgr-a-57cf9f84bc-f4jnl:9283/"}""" self.cmd_output_map[ """{"entity": "client.healthchecker", "format": "json", "prefix": "auth get"}""" ] = """{"dashboard": "http://rook-ceph-mgr-a-57cf9f84bc-f4jnl:7000/", "prometheus": "http://rook-ceph-mgr-a-57cf9f84bc-f4jnl:9283/"}""" @@ -322,7 +322,7 @@ def gen_arg_parser(cls, args_to_parse=None): common_group.add_argument( "--v2-port-enable", action="store_true", - default=False, + default=True, # default is True to enable v2 mon port in downstream help="Enable v2 mon port(3300) for mons", ) @@ -577,7 +577,7 @@ def _invalid_endpoint(self, endpoint_str): if not port.isdigit(): raise ExecutionFailureException(f"Port not valid: {port}") intPort = int(port) - if intPort < 1 or intPort > 2**16 - 1: + if intPort < 1 or intPort > 2 ** 16 - 1: raise ExecutionFailureException(f"Out of range port number: {port}") return ip_type @@ -969,9 +969,9 @@ def get_rbd_provisioner_caps_and_entity(self): rados_namespace, ) if rados_namespace != "": - caps["osd"] = ( - f"profile rbd pool={rbd_pool_name} namespace={rados_namespace}" - ) + caps[ + "osd" + ] = f"profile rbd pool={rbd_pool_name} namespace={rados_namespace}" else: caps["osd"] = f"profile rbd pool={rbd_pool_name}" @@ -1004,9 +1004,9 @@ def get_rbd_node_caps_and_entity(self): rados_namespace, ) if rados_namespace != "": - caps["osd"] = ( - f"profile rbd pool={rbd_pool_name} namespace={rados_namespace}" - ) + caps[ + "osd" + ] = f"profile rbd pool={rbd_pool_name} namespace={rados_namespace}" else: caps["osd"] = f"profile rbd pool={rbd_pool_name}" @@ -1613,13 +1613,13 @@ def _gen_output_map(self): self.out_map["CSI_RBD_PROVISIONER_SECRET_NAME"], ) = self.create_cephCSIKeyring_user("client.csi-rbd-provisioner") self.out_map["CEPHFS_POOL_NAME"] = self._arg_parser.cephfs_data_pool_name - self.out_map["CEPHFS_METADATA_POOL_NAME"] = ( - self._arg_parser.cephfs_metadata_pool_name - ) + self.out_map[ + "CEPHFS_METADATA_POOL_NAME" + ] = self._arg_parser.cephfs_metadata_pool_name self.out_map["CEPHFS_FS_NAME"] = self._arg_parser.cephfs_filesystem_name - self.out_map["RESTRICTED_AUTH_PERMISSION"] = ( - self._arg_parser.restricted_auth_permission - ) + self.out_map[ + "RESTRICTED_AUTH_PERMISSION" + ] = self._arg_parser.restricted_auth_permission self.out_map["RADOS_NAMESPACE"] = self._arg_parser.rados_namespace self.out_map["SUBVOLUME_GROUP"] = self._arg_parser.subvolume_group self.out_map["CSI_CEPHFS_NODE_SECRET"] = "" @@ -1662,16 +1662,16 @@ def _gen_output_map(self): self.out_map["MONITORING_ENDPOINT_PORT"], ) = self.get_active_and_standby_mgrs() self.out_map["RBD_POOL_NAME"] = self._arg_parser.rbd_data_pool_name - self.out_map["RBD_METADATA_EC_POOL_NAME"] = ( - self.validate_rbd_metadata_ec_pool_name() - ) + self.out_map[ + "RBD_METADATA_EC_POOL_NAME" + ] = self.validate_rbd_metadata_ec_pool_name() self.out_map["TOPOLOGY_POOLS"] = self._arg_parser.topology_pools - self.out_map["TOPOLOGY_FAILURE_DOMAIN_LABEL"] = ( - self._arg_parser.topology_failure_domain_label - ) - self.out_map["TOPOLOGY_FAILURE_DOMAIN_VALUES"] = ( - self._arg_parser.topology_failure_domain_values - ) + self.out_map[ + "TOPOLOGY_FAILURE_DOMAIN_LABEL" + ] = self._arg_parser.topology_failure_domain_label + self.out_map[ + "TOPOLOGY_FAILURE_DOMAIN_VALUES" + ] = self._arg_parser.topology_failure_domain_values if ( self._arg_parser.topology_pools != "" and self._arg_parser.topology_failure_domain_label != "" @@ -1730,9 +1730,9 @@ def _gen_output_map(self): ) = self.create_rgw_admin_ops_user() err = self.validate_rgw_endpoint(info_cap_supported) if self._arg_parser.rgw_tls_cert_path: - self.out_map["RGW_TLS_CERT"] = ( - self.validate_rgw_endpoint_tls_cert() - ) + self.out_map[ + "RGW_TLS_CERT" + ] = self.validate_rgw_endpoint_tls_cert() # if there is no error, set the RGW_ENDPOINT if err != "-1": self.out_map["RGW_ENDPOINT"] = self._arg_parser.rgw_endpoint