From 375da4da1aad99936b0ffdf24fab61360eb138ef Mon Sep 17 00:00:00 2001 From: Chiradeep Vittal Date: Wed, 10 Aug 2011 20:39:37 -0700 Subject: [PATCH] bug 11072: icky icky icky --- .../cloud/agent/api/routing/LoadBalancerConfigCommand.java | 2 +- .../cloud/network/lb/ElasticLoadBalancerManagerImpl.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java index fe0c146b85d..7cbfa0d7cf2 100644 --- a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java +++ b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java @@ -25,7 +25,7 @@ import com.cloud.agent.api.to.LoadBalancerTO; */ public class LoadBalancerConfigCommand extends NetworkElementCommand { LoadBalancerTO[] loadBalancers; - public String lbStatsVisibility; + public String lbStatsVisibility = "guest-network"; public String lbStatsIp; /* load balancer listen on this ip for stats */ public String lbStatsPort = "8081"; /*load balancer listen on this port for stats */ public String lbStatsSrcCidrs = "0/0" ; /* TODO : currently there is no filtering based on the source ip */ diff --git a/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java index e97dbfaec55..1541a11b0df 100644 --- a/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java +++ b/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java @@ -293,6 +293,12 @@ public class ElasticLoadBalancerManagerImpl implements elbVm.getPrivateIpAddress()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, elbVm.getInstanceName()); + //FIXME: why are we setting attributes directly? Ick!! There should be accessors and + //the constructor should set defaults. + cmd.lbStatsVisibility = _configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key()); + cmd.lbStatsUri = _configDao.getValue(Config.NetworkLBHaproxyStatsUri.key()); + cmd.lbStatsAuth = _configDao.getValue(Config.NetworkLBHaproxyStatsAuth.key()); + cmd.lbStatsPort = _configDao.getValue(Config.NetworkLBHaproxyStatsPort.key()); cmds.addCommand(cmd); }