InternalLb: boot args parameters cleanup for the internal lb vm
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e955459 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e955459 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e955459 Branch: refs/heads/internallb Commit: 7e9554596f3d0e1d68ada880c2c17c01a526b0f5 Parents: b7cf870 Author: Alena Prokharchyk <[email protected]> Authored: Wed May 1 10:01:16 2013 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Wed May 1 10:01:16 2013 -0700 ---------------------------------------------------------------------- .../lb/InternalLoadBalancerVMManagerImpl.java | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e955459/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java index 34fab30..e2628bb 100644 --- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java +++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java @@ -193,14 +193,11 @@ InternalLoadBalancerVMManager, VirtualMachineGuru<DomainRouterVO> { if (nic.isDefaultNic()) { buf.append(" gateway=").append(nic.getGateway()); - //FIXME - remove the DNS from boot args if decide to send DhcpEntry command for the Internal LB vm just the way we do for regular user vm buf.append(" dns1=").append(nic.getGateway()); } if (nic.getTrafficType() == TrafficType.Guest) { guestNetwork = _ntwkModel.getNetwork(nic.getNetworkId()); - //FIXME - not sure if sshonguest is required for this type of VM. Fix if needed - buf.append(" sshonguest=true"); } else if (nic.getTrafficType() == TrafficType.Management) { buf.append(" localgw=").append(dest.getPod().getGateway()); } else if (nic.getTrafficType() == TrafficType.Control) { @@ -235,15 +232,12 @@ InternalLoadBalancerVMManager, VirtualMachineGuru<DomainRouterVO> { } } - //FIXME - fix the type once earlyconfig and patchsystem vm scripts are fixed String type = "ilbvm"; buf.append(" type=" + type); - //FIXME - change it to DEBUG level later. -// if (s_logger.isDebugEnabled()) { -// s_logger.debug("Boot Args for " + profile + ": " + buf.toString()); -// } - s_logger.info("Boot Args for " + profile + ": " + buf.toString()); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Boot Args for " + profile + ": " + buf.toString()); + } return true; } @@ -489,7 +483,6 @@ InternalLoadBalancerVMManager, VirtualMachineGuru<DomainRouterVO> { _ntwkModel.isSecurityGroupSupportedInNetwork(guestNetwork), _ntwkModel.getNetworkTag(internalLbVm.getHypervisorType(), guestNetwork)); - //FIXME - for ha proxy LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs, guestNic.getIp4Address(), guestNic.getIp4Address(), internalLbVm.getPrivateIpAddress(), _itMgr.toNicTO(guestNicProfile, internalLbVm.getHypervisorType()), internalLbVm.getVpcId()); @@ -908,7 +901,6 @@ InternalLoadBalancerVMManager, VirtualMachineGuru<DomainRouterVO> { return false; } - // FIXME: Have to return state for individual command in the future boolean result = true; if (answers.length > 0) { for (Answer answer : answers) {
