Skip to content

Commit

Permalink
fix vagrant configs
Browse files Browse the repository at this point in the history
  • Loading branch information
jdowning committed Apr 11, 2014
1 parent a61f0d0 commit cd6f4b8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
5 changes: 3 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ PUPPET_HOME= ENV['PUPPET_HOME']

Vagrant.configure("2") do |config|
config.vm.hostname = 'puppet-statsd'
config.vm.synced_folder "modules", "/tmp/puppet-modules"
config.vm.synced_folder ".", "/tmp/puppet-modules/statsd"
config.vm.synced_folder "modules", "/tmp/puppet-modules", type: "rsync", rsync__exclude: ".git/"
config.vm.synced_folder ".", "/tmp/puppet-modules/statsd", type: "rsync", rsync__exclude: ".git/"

config.vm.define "centos" do |centos|
centos.vm.box = 'centos64'
Expand All @@ -22,6 +22,7 @@ Vagrant.configure("2") do |config|
config.vm.define "ubuntu" do |ubuntu|
ubuntu.vm.box = 'ubuntu64'
ubuntu.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210.box'
ubuntu.vm.provision :shell, :inline => "sudo aptitude update"
ubuntu.vm.provision :puppet do |puppet|
puppet.manifests_path = "tests"
puppet.manifest_file = "vagrant.pp"
Expand Down
1 change: 1 addition & 0 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
command => '/usr/bin/npm install --save statsd-influxdb-backend',
cwd => "${statsd::node_module_dir}/statsd",
unless => "/usr/bin/test -d ${statsd::node_module_dir}/statsd/node_modules/statsd-influxdb-backend",
require => Package['statsd'],
}
}

Expand Down
7 changes: 1 addition & 6 deletions tests/vagrant.pp
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
class { 'nodejs': manage_repo => true }->
class { 'statsd':
backends => [ './backends/graphite', 'statsd-influxdb-backend' ],
influxdb_host => 'localhost',
}
exec { 'install-statsd-influxdb-backend':
command => '/usr/bin/npm install statsd-influxdb-backend',
cwd => '/usr/lib/node_modules/statsd',
unless => '/usr/bin/test -d /usr/lib/node_modules/statsd/node_modules/statsd-influxdb-backend',
require => Class['statsd'],
}

0 comments on commit cd6f4b8

Please sign in to comment.