Support for shared networks

Author: Pearl Dsilva

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java

@@ -143,9 +143,9 @@ private void updateSystemVmTemplates(final Connection conn) {
                 //put(Hypervisor.HypervisorType.KVM, "81b3e48bb934784a13555a43c5ef5ffb");
                 //put(Hypervisor.HypervisorType.XenServer, "1b178a5dbdbe090555515340144c6017");
                 //put(Hypervisor.HypervisorType.VMware, "e6a88e518c57d6f36c096c4204c3417f");
-                put(Hypervisor.HypervisorType.KVM, "d60a5afaf9a86f69ebbae4c2bae6ff45");
-                put(Hypervisor.HypervisorType.XenServer, "01cd0dd45840e0921e23aa2bf6c9a334");
-                put(Hypervisor.HypervisorType.VMware, "43999dc771d21e85330d964d6a48d643");
+                put(Hypervisor.HypervisorType.KVM, "0d95bb3d9385097dec8b485e46eae34b");
+                put(Hypervisor.HypervisorType.XenServer, "8dd2df4eba815711e68cf204a8df7650");
+                put(Hypervisor.HypervisorType.VMware, "6d18a4e41589fa32217adb0d0be3d286");
                 put(Hypervisor.HypervisorType.Hyperv, "5c94da45337cf3e1910dcbe084d4b9ad");
                 put(Hypervisor.HypervisorType.LXC, "81b3e48bb934784a13555a43c5ef5ffb");
                 put(Hypervisor.HypervisorType.Ovm3, "875c5c65455fc06c4a012394410db375");

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -4406,7 +4406,6 @@ private UserVm startVirtualMachine(long vmId, Long podId, Long clusterId, Long h
 
     private void addUserVMCmdlineArgs(Long vmId, VirtualMachineProfile profile, DeployDestination dest, StringBuilder buf) {
         UserVmVO k8sVM = _vmDao.findById(vmId);
-        String dhcpRange = null;
         buf.append(" template=domP");
         buf.append(" name=").append(profile.getHostName());
         buf.append(" type=").append(k8sVM.getUserVmType());
@@ -4431,16 +4430,6 @@ private void addUserVMCmdlineArgs(Long vmId, VirtualMachineProfile profile, Depl
                 }
                 buf.append(" localgw=").append(dest.getPod().getGateway());
             }
-            if (nic.isDefaultNic()) {
-                final long guestNetworkId = nic.getNetworkId();
-                final NetworkVO guestNetwork = _networkDao.findById(guestNetworkId);
-                if (guestNetwork != null) {
-                    final String cidr = _networkModel.getValidNetworkCidr(guestNetwork);
-                    if (cidr != null) {
-                        dhcpRange = NetUtils.getDhcpRange(cidr);
-                    }
-                }
-            }
         }
         DataCenterVO dc = _dcDao.findById(profile.getVirtualMachine().getDataCenterId());
         buf.append(" internaldns1=").append(dc.getInternalDns1());
@@ -4451,9 +4440,6 @@ private void addUserVMCmdlineArgs(Long vmId, VirtualMachineProfile profile, Depl
         if (dc.getDns2() != null) {
             buf.append(" dns2=").append(dc.getDns2());
         }
-        if (dhcpRange != null) {
-            buf.append(" dhcprange=" + dhcpRange);
-        }
         s_logger.info("cmdline details: "+ buf.toString());
     }
 

systemvm/debian/opt/cloud/bin/setup/CKSNode.sh

@@ -45,14 +45,8 @@ setup_k8s_node() {
     enable_fwding 1
     enable_irqbalance 0
     setup_ntp
+    dhclient
 
-    mkdir -p /var/lib/dhcp/
-    DHCPIP=$(cat /var/cache/cloud/cmdline | sed 's/.*dhcprange=\([0-9\.]*\).*/\1/')
-cat <<EOF >> /var/lib/dhcp/dhclient.leases
-lease {
-  option dhcp-server-identifier $DHCPIP
-}
-EOF
     rm -f /etc/logrotate.d/cloud
 
     log_it "Starting cloud-init services"

systemvm/debian/opt/cloud/bin/setup/postinit.sh

@@ -42,6 +42,10 @@ then
   fi
 fi
 
+if [ "$TYPE" == "CKSNode" ]; then
+  pkill -9 dhclient
+fi
+
 [ ! -f /var/cache/cloud/enabled_svcs ] && touch /var/cache/cloud/enabled_svcs
 for svc in $(cat /var/cache/cloud/enabled_svcs)
 do

tools/appliance/systemvmtemplate/scripts/cleanup.sh

@@ -20,7 +20,7 @@ set -e
 
 function cleanup_apt() {
   export DEBIAN_FRONTEND=noninteractive
-  apt-get -y remove --purge dictionaries-common busybox isc-dhcp-client isc-dhcp-common \
+  apt-get -y remove --purge dictionaries-common busybox \
     task-english task-ssh-server tasksel tasksel-data laptop-detect wamerican sharutils \
     nano util-linux-locales krb5-locales