Merge pull request #10524 from petr-balogh/external-mode-rgw-secure-c…

…heck

Fix external mode rgw_secure condition

ocs_ci/ocs/awscli_pod.py

@@ -77,7 +77,7 @@ def create_awscli_pod(scope_name=None, namespace=None, service_account=None):
         f"cp {constants.SERVICE_CA_CRT_AWSCLI_PATH} {constants.AWSCLI_CA_BUNDLE_PATH}"
     )
 
-    if storagecluster_independent_check() and config.EXTERNAL_MODE["rgw_secure"]:
+    if storagecluster_independent_check() and config.EXTERNAL_MODE.get("rgw_secure"):
         log.info("Concatenating the RGW CA to the AWS CLI pod's CA bundle")
         awscli_pod_obj.exec_cmd_on_pod(
             f"bash -c 'wget -O - {config.EXTERNAL_MODE['rgw_cert_ca']} >> {constants.AWSCLI_CA_BUNDLE_PATH}'"

ocs_ci/ocs/resources/rgw.py

@@ -58,7 +58,7 @@ def get_credentials(self, secret_name=constants.NOOBAA_OBJECTSTOREUSER_SECRET):
             cephobjectstore = cos_ocp_obj.get(
                 resource_name=constants.RGW_ROUTE_EXTERNAL_MODE
             )
-            if config.EXTERNAL_MODE["rgw_secure"]:
+            if config.EXTERNAL_MODE.get("rgw_secure"):
                 endpoint = cephobjectstore["status"]["endpoints"]["secure"][0]
             else:
                 endpoint = cephobjectstore["status"]["endpoints"]["insecure"][0]