Only warn about rouge instances that compute should know about.

1 files changed, 6 insertions, 3 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 68b163355..39d7af9c1 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1111,6 +1111,9 @@ class ComputeManager(manager.SchedulerDependentManager):
         # Are there VMs not in the DB?
         for vm_not_found_in_db in vms_not_found_in_db:
             name = vm_not_found_in_db
-            # TODO(justinsb): What to do here?  Adopt it?  Shut it down?
-            LOG.warning(_("Found VM not in DB: '%(name)s'.  Ignoring")
-                        % locals())
+
+            # We only care about instances that compute *should* know about
+            if name.startswith("instance-"):
+                # TODO(justinsb): What to do here?  Adopt it?  Shut it down?
+                LOG.warning(_("Found VM not in DB: '%(name)s'.  Ignoring")
+                            % locals())