Permalink
Browse files

fix bug 1039876 - move socorro.pp to vagrant.pp

  • Loading branch information...
1 parent 0055deb commit cc3b102185dd319dfa23759523ceef3e26c16c13 @rhelmer rhelmer committed Jul 17, 2014
Showing with 9 additions and 10 deletions.
  1. +1 −1 Vagrantfile
  2. +0 −9 puppet/manifests/init.pp
  3. +8 −0 puppet/manifests/{socorro.pp → vagrant.pp}
View
@@ -68,7 +68,7 @@ Vagrant::Config.run do |config|
config.vm.provision :puppet do |puppet|
puppet.manifests_path = "puppet/manifests"
- puppet.manifest_file = "init.pp"
+ puppet.manifest_file = "vagrant.pp"
# enable this to see verbose and debug puppet output
if CONF['debug_mode'] == true
puppet.options = "--verbose --debug"
View
@@ -1,9 +0,0 @@
-Exec {
- logoutput => 'on_failure'
-}
-
-import 'socorro'
-
-node default {
- include webapp::socorro
-}
@@ -1,3 +1,11 @@
+Exec {
+ logoutput => 'on_failure'
+}
+
+node default {
+ include webapp::socorro
+}
+
# Set up basic Socorro requirements.
class webapp::socorro {

0 comments on commit cc3b102

Please sign in to comment.