modules/mu/clouds/aws/server.rb in cloud-mu-3.0.0 vs modules/mu/clouds/aws/server.rb in cloud-mu-3.0.1

@@ -118,12 +118,14 @@
               @mu_name = @deploy.getResourceName(@config['name'])
             end
             @config['mu_name'] = @mu_name
 
           end
+
           @config['instance_secret'] ||= Password.random(50)
 
+          @groomer = MU::Groomer.new(self) unless MU.inGem?
         end
 
         @@userdata_semaphore = Mutex.new
 
         # Fetch our baseline userdata argument (read: "script that runs on first
@@ -936,14 +938,20 @@
             }
           end
 
           # See if this node already exists in our config management. If it does,
           # we're done.
-          if @groomer.haveBootstrapped?
+          if MU.inGem?
+            MU.log "Deploying from a gem, not grooming"
+
+            return true
+          elsif @groomer.haveBootstrapped?
             MU.log "Node #{node} has already been bootstrapped, skipping groomer setup.", MU::NOTICE
+
             if @config['groom'].nil? or @config['groom']
               @groomer.saveDeployData
             end
+
             MU::MommaCat.unlock(instance.instance_id+"-orchestrate")
             MU::MommaCat.unlock(instance.instance_id+"-groom")
             return true
           end