lib/testlab/node.rb in testlab-1.1.0 vs lib/testlab/node.rb in testlab-1.2.0

@@ -10,28 +10,27 @@
     STATUS_KEYS   = %w(id instance_id state user ip port provider provisioners).map(&:to_sym)
 
     # Sub-Modules
     autoload :Actions,       'testlab/node/actions'
     autoload :ClassMethods,  'testlab/node/class_methods'
-    autoload :Lifecycle,     'testlab/node/lifecycle'
     autoload :LXC,           'testlab/node/lxc'
     autoload :MethodMissing, 'testlab/node/method_missing'
     autoload :Provision,     'testlab/node/provision'
     autoload :SSH,           'testlab/node/ssh'
     autoload :Status,        'testlab/node/status'
 
     include TestLab::Node::Actions
-    include TestLab::Node::Lifecycle
     include TestLab::Node::LXC
     include TestLab::Node::MethodMissing
     include TestLab::Node::Provision
     include TestLab::Node::SSH
     include TestLab::Node::Status
 
     extend  TestLab::Node::ClassMethods
 
     include TestLab::Support::Execution
+    include TestLab::Support::Lifecycle
 
     include TestLab::Utility::Misc
 
     # Associations and Attributes
     belongs_to :labfile,       :class_name => 'TestLab::Labfile'
@@ -64,10 +63,10 @@
       self.labfile.repo_dir
     end
 
     def domain
       self.config[:bind] ||= Hash.new
-      self.config[:bind][:domain]
+      self.config[:bind][:domain] ||= 'tld.invalid'
     end
 
   end
 
 end