diff --git a/managed/src/main/java/com/yugabyte/yw/common/NodeManager.java b/managed/src/main/java/com/yugabyte/yw/common/NodeManager.java index b0a8b1aae762..016cf7793422 100644 --- a/managed/src/main/java/com/yugabyte/yw/common/NodeManager.java +++ b/managed/src/main/java/com/yugabyte/yw/common/NodeManager.java @@ -678,7 +678,10 @@ private Map getYCQLGFlags( } private Map getMasterDefaultGFlags( - AnsibleConfigureServers.Params taskParam, Boolean useHostname, Boolean useSecondaryIp) { + AnsibleConfigureServers.Params taskParam, + Boolean useHostname, + Boolean useSecondaryIp, + Boolean isDualNet) { Map gflags = new HashMap<>(); Universe universe = Universe.getOrBadRequest(taskParam.universeUUID); NodeDetails node = universe.getNode(taskParam.nodeName); @@ -710,6 +713,8 @@ private Map getMasterDefaultGFlags( String.format("%s:%s", node.cloudInfo.secondary_private_ip, node.masterRpcPort); String bindAddresses = bindAddressSecondary + "," + bindAddressPrimary; gflags.put("rpc_bind_addresses", bindAddresses); + } else if (isDualNet) { + gflags.put("use_private_ip", "cloud"); } gflags.put("webserver_port", Integer.toString(node.masterHttpPort)); @@ -813,7 +818,8 @@ private Map getAllDefaultGFlags( extra_gflags.putAll( getTServerDefaultGflags(taskParam, useHostname, useSecondaryIp, isDualNet)); } else { - extra_gflags.putAll(getMasterDefaultGFlags(taskParam, useHostname, useSecondaryIp)); + extra_gflags.putAll( + getMasterDefaultGFlags(taskParam, useHostname, useSecondaryIp, isDualNet)); } UserIntent userIntent = getUserIntentFromParams(taskParam); diff --git a/managed/src/main/java/com/yugabyte/yw/controllers/handlers/UniverseCRUDHandler.java b/managed/src/main/java/com/yugabyte/yw/controllers/handlers/UniverseCRUDHandler.java index 4ab6cd929267..794ca2ed63f9 100644 --- a/managed/src/main/java/com/yugabyte/yw/controllers/handlers/UniverseCRUDHandler.java +++ b/managed/src/main/java/com/yugabyte/yw/controllers/handlers/UniverseCRUDHandler.java @@ -455,7 +455,7 @@ public UniverseResp createUniverse(Customer customer, UniverseDefinitionTaskPara universe.updateConfig(ImmutableMap.of(Universe.TAKE_BACKUPS, "true")); // If cloud enabled and deployment AZs have two subnets, mark the cluster as a // non legacy cluster for proper operations. - if (runtimeConfigFactory.staticApplicationConf().getBoolean("yb.cloud.enabled")) { + if (runtimeConfigFactory.forCustomer(customer).getBoolean("yb.cloud.enabled")) { Provider provider = Provider.getOrBadRequest(UUID.fromString(primaryCluster.userIntent.provider)); AvailabilityZone zone = provider.regions.get(0).zones.get(0);