lib/testlab/node/lifecycle.rb in testlab-0.6.11 vs lib/testlab/node/lifecycle.rb in testlab-0.6.12

- old
+ new

@@ -13,11 +13,11 @@ def setup @ui.logger.debug { "Node Setup: #{self.id} " } please_wait(:ui => @ui, :message => format_object_action(self, 'Setup', :green)) do - global_provisioners.each do |provisioner| + self.all_provisioners.each do |provisioner| @ui.logger.info { ">>>>> NODE PROVISIONER SETUP: #{provisioner} <<<<<" } p = provisioner.new(self.config, @ui) p.respond_to?(:on_node_setup) and p.on_node_setup(self) end @@ -32,11 +32,11 @@ (self.state == :not_created) and return false please_wait(:ui => @ui, :message => format_object_action(self, 'Teardown', :red)) do - global_provisioners.each do |provisioner| + self.all_provisioners.each do |provisioner| @ui.logger.info { ">>>>> NODE PROVISIONER TEARDOWN: #{provisioner} <<<<<" } p = provisioner.new(self.config, @ui) p.respond_to?(:on_node_teardown) and p.on_node_teardown(self) end @@ -52,13 +52,13 @@ self.setup true end - def global_provisioners - [self.provisioners, self.containers.map(&:provisioners)].flatten.compact.uniq + # Returns all defined provisioners for this node and it's networks and containers. + def all_provisioners + [self.provisioners, self.networks.map(&:provisioners), self.containers.map(&:provisioners)].flatten.compact.uniq end end - end end