lib/jamie/vagrant.rb in jamie-0.1.0.alpha8 vs lib/jamie/vagrant.rb in jamie-0.1.0.alpha9

@@ -43,26 +43,12 @@
         c.vm.customize ["modifyvm", :id, "--memory", driver['memory']]
 
         c.vm.provision :chef_solo do |chef|
           chef.log_level = config.jamie.log_level
           chef.run_list = instance.run_list
-          chef.json = instance.json
-          chef.data_bags_path = calculate_data_bags_path(config, instance)
+          chef.json = instance.attributes
+          chef.data_bags_path = instance.suite.data_bags_path
         end
-      end
-    end
-
-    def self.calculate_data_bags_path(config, instance)
-      base_path = config.jamie.test_base_path
-      instance_data_bags_path = File.join(base_path, instance.name, "data_bags")
-      common_data_bags_path = File.join(base_path, "data_bags")
-
-      if File.directory?(instance_data_bags_path)
-        instance_data_bags_path
-      elsif File.directory?(common_data_bags_path)
-        common_data_bags_path
-      else
-        nil
       end
     end
   end
 end