Merge pull request #489 from parth-gr/external-downstream-multisite-4.12

Bug 2192821: external: fix rgw check if no multisite flag is passed
red-hat-storage · May 16, 2023 · bc1e980 · bc1e980
2 parents 669491b + 0ea385a
commit bc1e980
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/deploy/examples/create-external-cluster-resources.py b/deploy/examples/create-external-cluster-resources.py
@@ -1485,10 +1485,6 @@ def _gen_output_map(self):
                 self.create_rgw_admin_ops_user()
             else:
                 if (
-                    self._arg_parser.rgw_realm_name == ""
-                    and self._arg_parser.rgw_zonegroup_name == ""
-                    and self._arg_parser.rgw_zone_name == ""
-                ) or (
                     self._arg_parser.rgw_realm_name != ""
                     and self._arg_parser.rgw_zonegroup_name != ""
                     and self._arg_parser.rgw_zone_name != ""
@@ -1502,6 +1498,16 @@ def _gen_output_map(self):
                     err = self.validate_rgw_multisite(
                         self._arg_parser.rgw_zone_name, "zone"
                     )
+
+                if (
+                    self._arg_parser.rgw_realm_name == ""
+                    and self._arg_parser.rgw_zonegroup_name == ""
+                    and self._arg_parser.rgw_zone_name == ""
+                ) or (
+                    self._arg_parser.rgw_realm_name != ""
+                    and self._arg_parser.rgw_zonegroup_name != ""
+                    and self._arg_parser.rgw_zone_name != ""
+                ):
                     (
                         self.out_map["RGW_ADMIN_OPS_USER_ACCESS_KEY"],
                         self.out_map["RGW_ADMIN_OPS_USER_SECRET_KEY"],