Updated Branches: refs/heads/master 7ac9d5774 -> eacb65fbf
Updated logic which assigns member ip address in cloud controller Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/da70c045 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/da70c045 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/da70c045 Branch: refs/heads/master Commit: da70c045f54615cd34aee29c47ee86e71944d862 Parents: a7a6ef2 Author: Imesh Gunaratne <[email protected]> Authored: Tue Nov 26 20:53:27 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Nov 26 20:53:27 2013 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 30 ++++++-------------- 1 file changed, 9 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/da70c045/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 709cce6..b50bc89 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -409,37 +409,25 @@ public class CloudControllerServiceImpl implements CloudControllerService { // reset ip ip = ""; // default behavior is autoIpAssign=false - if (autoAssignIpProp == null - || (autoAssignIpProp != null && autoAssignIpProp - .equals("false"))) { + if (autoAssignIpProp == null || (autoAssignIpProp != null && autoAssignIpProp.equals("false"))) { // allocate an IP address - manual IP assigning mode ip = iaas.getIaas().associateAddress(iaas, node); + log.info("Allocated ip address: " + ip); } - if (ip.isEmpty() - && node.getPublicAddresses() != null - && node.getPublicAddresses().iterator() - .hasNext()) { + if (ip.isEmpty() && node.getPublicAddresses() != null && node.getPublicAddresses().iterator().hasNext()) { ip = node.getPublicAddresses().iterator().next(); + log.info("Public ip address: " + ip); } - String privateIp = null; - if (node.getPrivateAddresses() != null - && node.getPrivateAddresses().iterator() - .hasNext()) { - privateIp = node.getPrivateAddresses().iterator().next(); - } - log.info("private ip of the instance is: " + privateIp); + // if not public IP is assigned, we're using private IP - if (ip.isEmpty() - && node.getPrivateAddresses() != null - && node.getPrivateAddresses().iterator() - .hasNext()) { + if (ip.isEmpty() && node.getPrivateAddresses() != null && node.getPrivateAddresses().iterator().hasNext()) { ip = node.getPrivateAddresses().iterator().next(); + log.info("Private ip address: " + ip); } if (node.getId() == null) { - String msg = "Node id of the starting instance is null.\n" - + node.toString(); + String msg = "Node id of the starting instance is null.\n" + node.toString(); log.fatal(msg); throw new CloudControllerException(msg); } @@ -464,7 +452,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { // trigger topology TopologyBuilder.handleMemberSpawned(memberID, serviceCtxt.getCartridgeType(), clusterId, - node.getId(), partition, privateIp); + node.getId(), partition, ip); //update the topology with the newly spawned member // publish data
