Vagrantfile in vagrant-librarian-puppet-0.9.0 vs Vagrantfile in vagrant-librarian-puppet-0.9.1
- old
+ new
@@ -1,32 +1,34 @@
#!/usr/bin/env ruby
# -*- mode: ruby -*-
# vi: set ft=ruby :
Vagrant.configure('2') do |config|
- config.vm.box = 'precise64'
- config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
+ # box needs to provide puppet >= 4
+ config.vm.box = 'puppetlabs/ubuntu-12.04-64-puppet'
config.vm.define "default" do |default|
default.librarian_puppet.puppetfile_dir = 'puppet'
default.librarian_puppet.placeholder_filename = ".gitkeep"
default.librarian_puppet.resolve_options = { :force => true }
+ default.librarian_puppet.destructive = false
default.vm.provision :puppet do |puppet|
- puppet.manifests_path = 'manifests'
- puppet.manifest_file = 'init.pp'
+ puppet.environment_path = "environments"
+ puppet.environment = "default"
puppet.module_path = 'puppet/modules'
end
end
config.vm.define "multidir" do |multidir|
multidir.librarian_puppet.puppetfile_dir = ['puppet', 'puppet_custom']
multidir.librarian_puppet.placeholder_filename = ".gitkeep"
multidir.librarian_puppet.resolve_options = { :force => true }
+ multidir.librarian_puppet.destructive = false
multidir.vm.provision :puppet do |puppet|
- puppet.manifests_path = 'manifests'
- puppet.manifest_file = 'multidir.pp'
+ puppet.environment_path = "environments"
+ puppet.environment = "multidir"
puppet.module_path = ['puppet_custom/modules', 'puppet/modules']
end
end
end