configDrive: Fix failure to delete (unstarted) VM (#6146)

* configDrive: Fix failure to delete (unstarted)VM

* Address comments

* Address comments

Author: Pearl1594

server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java

@@ -497,7 +497,7 @@ private Long findAgentId(VirtualMachineProfile profile, DeployDestination dest,
             agentId = dest.getHost().getId();
         }
         if (!VirtualMachineManager.VmConfigDriveOnPrimaryPool.valueIn(dest.getDataCenter().getId()) &&
-                !VirtualMachineManager.VmConfigDriveForceHostCacheUse.valueIn(dest.getDataCenter().getId())) {
+                !VirtualMachineManager.VmConfigDriveForceHostCacheUse.valueIn(dest.getDataCenter().getId()) && dataStore != null) {
             agentId = findAgentIdForImageStore(dataStore);
         }
         return agentId;
@@ -630,6 +630,10 @@ private DataStore getDatastoreForConfigDriveIso(DiskTO disk, VirtualMachineProfi
     private boolean deleteConfigDriveIso(final VirtualMachine vm) throws ResourceUnavailableException {
         Long hostId  = (vm.getHostId() != null) ? vm.getHostId() : vm.getLastHostId();
         Location location = getConfigDriveLocation(vm.getId());
+        if (hostId == null) {
+            LOG.info(String.format("The VM was never booted; no config-drive ISO created for VM %s", vm.getName()));
+            return true;
+        }
         if (location == Location.HOST) {
             return deleteConfigDriveIsoOnHostCache(vm, hostId);
         }
@@ -639,7 +643,9 @@ private boolean deleteConfigDriveIso(final VirtualMachine vm) throws ResourceUna
 
         if (location == Location.SECONDARY) {
             dataStore = _dataStoreMgr.getImageStoreWithFreeCapacity(vm.getDataCenterId());
-            agentId = findAgentIdForImageStore(dataStore);
+            if (dataStore != null) {
+                agentId = findAgentIdForImageStore(dataStore);
+            }
         } else if (location == Location.PRIMARY) {
             List<VolumeVO> volumes = _volumeDao.findByInstanceAndType(vm.getId(), Volume.Type.ROOT);
             if (volumes != null && volumes.size() > 0) {