Permalink
Browse files

Fixes!

  • Loading branch information...
1 parent 5151f3a commit 66bee6bc964e2a1b058559b0cb62324820764e2a @jfryman committed Nov 13, 2012
Showing with 8 additions and 3 deletions.
  1. +4 −0 README.md
  2. +2 −1 config/autogen_defaults.yml
  3. +2 −2 rake/vagrant.rb
View
@@ -21,6 +21,10 @@ manifests/cookbooks/bundles are, and then go and start developing! You
may alternatively clone this repository and setup your own configuration
for your environment.
+Edit the defaults set in `config/autogen_defaults.yml`, and you should
+be off to the races.
+
+## Provisioners
### Puppet
This provisioner allows support for running Puppet on a node without a
Puppet Master.
@@ -5,7 +5,8 @@ default: &default
orgname: vagrant.test
vbox: debian-6.0.6-amd64
memory_size: 512
-# But don't edit this unless you know what you're doing.
+# Edit puppet_manifests and puppet_modules to point to paths you want
+# the puppetmaster to serve out.
puppetmaster:
<<: *default
ip: 192.168.200.2
View
@@ -80,7 +80,7 @@
desc "Re-initizlie a base nodes.yml (destructive)"
task :reinitialize do
- FileUtils.rm(NODES_FILE) if !File.exists?(NODES_FILE)
+ FileUtils.rm(NODES_FILE) if File.exists?(NODES_FILE)
Rake::Task["vagrant:node:initialize"].invoke
end
@@ -226,7 +226,7 @@
task "vagrant:basebox:build:all" => 'vagrant:node:initialize'
['add', 'remove'].each do |t|
- task "vagrant:node:#{t}" => 'vagrant:puppetmaster:provision'
+ task "vagrant:node:#{t}" => 'vagrant:puppetmaster:reload_dns'
end
# Make sure a nodes.yml exists to be added to

0 comments on commit 66bee6b

Please sign in to comment.