modules/mu/cleanup.rb in cloud-mu-3.1.2beta2 vs modules/mu/cleanup.rb in cloud-mu-3.1.2

@@ -144,18 +144,22 @@
                 regionthreads << Thread.new {
                   MU.dupGlobals(parent_thread_id)
                   Thread.abort_on_exception = false
                   MU.setVar("curRegion", r)
                   projects = []
-                  if $MU_CFG and $MU_CFG[cloud.downcase] and
-                     $MU_CFG[cloud.downcase][credset] and
-                     $MU_CFG[cloud.downcase][credset]["project"]
+                  if habitats
+                    projects = habitats
+                  else
+                    if $MU_CFG and $MU_CFG[cloud.downcase] and
+                       $MU_CFG[cloud.downcase][credset] and
+                       $MU_CFG[cloud.downcase][credset]["project"]
 # XXX GCP credential schema needs an array for projects
-                    projects << $MU_CFG[cloud.downcase][credset]["project"]
-                  end
-                  begin
-                    projects.concat(cloudclass.listProjects(credset))
-                  rescue NoMethodError
+                      projects << $MU_CFG[cloud.downcase][credset]["project"]
+                    end
+                    begin
+                      projects.concat(cloudclass.listProjects(credset))
+                    rescue NoMethodError
+                    end
                   end
 
                   if projects == []
                     projects << "" # dummy
                     MU.log "Checking for #{cloud}/#{credset} resources from #{MU.deploy_id} in #{r}", MU::NOTICE