From: Michael Friedrich <Michael.Friedrich@netways.de>
Date: Sun, 13 Oct 2013 19:53:11 +0000 (+0200)
Subject: Vagrant: Cleanup.
X-Git-Tag: v0.0.3~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=616e0f950ac23cf5ef26ba6898b728f5ab5cb4a7;p=icinga2

Vagrant: Cleanup.
---

diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp
index 1c3c1f18f..451792dae 100644
--- a/.vagrant-puppet/manifests/default.pp
+++ b/.vagrant-puppet/manifests/default.pp
@@ -7,7 +7,6 @@ include icinga-rpm-snapshot
 
 Exec { path => '/bin:/usr/bin:/sbin:/usr/sbin' }
 
-
 exec { 'create-mysql-icinga2-ido-db':
   unless => 'mysql -uicinga -picinga icinga',
   command => 'mysql -uroot -e "CREATE DATABASE icinga; \
@@ -25,7 +24,6 @@ exec { 'create-mysql-icinga2-ido-db':
 #  require => Service['postgresql']
 #}
 
-
 php::extension { ['php-mysql']:
   require => [ Class['mysql'] ]
 }
@@ -55,24 +53,6 @@ file { '/etc/profile.d/env.sh':
   source => 'puppet:////vagrant/.vagrant-puppet/files/etc/profile.d/env.sh'
 }
 
-
-exec { 'install nodejs':
-  command => 'yum -d 0 -e 0 -y --enablerepo=epel install npm',
-  unless  => 'rpm -qa | grep ^npm',
-  require => Class['epel']
-}
-
-
-# for development only, not rpms
-$icinga2_dev_packages = [ 'doxygen', 'openssl-devel',
-                      'gcc-c++', 'libstdc++-devel',
-                      'automake', 'autoconf',
-                      'libtool', 'flex', 'bison',
-                      'boost-devel', 'boost-program-options',
-                      'boost-signals', 'boost-system',
-                      'boost-test', 'boost-thread' ]
-package { $icinga2_dev_packages: ensure => installed }
-
 # nagios plugins from epel
 package { 'nagios-plugins-all':
   ensure => installed,
@@ -125,6 +105,7 @@ user { 'vagrant':
 service { 'icinga2':
   enable => true,
   ensure => running,
+  hasrestart => true,
   require => Package['icinga2']
 }
 
@@ -140,7 +121,7 @@ file { "/etc/icinga2/features-enabled/*":
   notify => Service['icinga2']
 }
 
-# provision icinga2-ido-mysql db
+# populate icinga2-ido-mysql db
 exec { 'populate-icinga2-ido-mysql-db':
   unless  => 'mysql -uicinga -picinga icinga -e "SELECT * FROM icinga_dbversion;" &> /dev/null',
   command => 'mysql -uicinga -picinga icinga < /usr/share/doc/icinga2-ido-mysql-$(rpm -q icinga2-ido-mysql | cut -d\'-\' -f4)/schema/mysql.sql',
diff --git a/Vagrantfile b/Vagrantfile
index 6a5b66918..464d86051 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -89,8 +89,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :puppet do |puppet|
     puppet.module_path = ".vagrant-puppet/modules"
     puppet.manifests_path = ".vagrant-puppet/manifests"
-    # puppet.options = "-v -d"
-    puppet.options = "--verbose --debug"
+    #puppet.options = "--verbose --debug"
   end
 
   config.vm.provision :shell, :path => ".vagrant-puppet/manifests/finalize.sh"