diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config index a7d2d141f9b..4664d1c454e 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -426,7 +426,7 @@ setup_console_proxy() { setup_elbvm() { log_it "Setting up Elastic Load Balancer system vm" local hyp=$1 - setup_common eth0 eth1 eth2 + setup_common eth0 eth1 sed -i /gateway/d /etc/hosts public_ip=$ETH2_IP [ "$ETH2_IP" == "0.0.0.0" ] || [ "$ETH2_IP" == "" ] && public_ip=$ETH0_IP @@ -447,6 +447,7 @@ setup_elbvm() { enable_svc cloud-passwd-srvr 0 enable_svc cloud 0 chkconfig nfs-common off + chkconfig portmap off } setup_default() { diff --git a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh b/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh index e9bcc5ebe2f..85361b55307 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh +++ b/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh @@ -90,6 +90,16 @@ dhcpsrvr_svcs() { echo "cloud nfs-common haproxy portmap" > /var/cache/cloud/disabled_svcs } +elbvm_svcs() { + chkconfig cloud off + chkconfig haproxy on ; + chkconfig ssh on + chkconfig nfs-common off + chkconfig portmap off + echo "ssh haproxy" > /var/cache/cloud/enabled_svcs + echo "cloud cloud-passwd-srvr dnsmasq apache2 nfs-common portmap" > /var/cache/cloud/disabled_svcs +} + enable_pcihotplug() { sed -i -e "/acpiphp/d" /etc/modules sed -i -e "/pci_hotplug/d" /etc/modules @@ -188,4 +198,14 @@ then fi fi +if [ "$TYPE" == "elbvm" ] +then + elbvm_svcs + if [ $? -gt 0 ] + then + printf "Failed to execute elbvm svcs\n" >$logfile + exit 9 + fi +fi + exit $? diff --git a/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java index e84fd757941..a15ba2fb819 100644 --- a/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java +++ b/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java @@ -474,6 +474,7 @@ public class ElasticLoadBalancerManagerImpl implements List> networks = new ArrayList>(2); NicProfile guestNic = new NicProfile(); + guestNic.setDefaultNic(true); networks.add(new Pair((NetworkVO) guestNetwork, guestNic)); networks.add(new Pair(controlConfig, null));