Vagrant: Fix installation of perl-CPAN

refs #4506

.vagrant-puppet/manifests/default.pp

@@ -400,7 +400,8 @@ exec { 'create_monitoring_test_config':
   command => 'sudo install -o root -g root -d /usr/local/share/misc/ && \
               sudo /usr/local/bin/create_monitoring_test_config.pl -l icinga \
               /usr/local/share/misc/monitoring_test_config',
-  creates => '/usr/local/share/misc/monitoring_test_config'
+  creates => '/usr/local/share/misc/monitoring_test_config',
+  require => Cpan['Monitoring::Generator::TestConfig']
 }
 
 define populate_monitoring_test_config {
@@ -418,14 +419,14 @@ define populate_monitoring_test_config {
   }
 }
 
-file { '/usr/local/icinga-mysql/etc/conf.d/test_config':
+file { '/usr/local/icinga-mysql/etc/conf.d/test_config/':
   ensure  => directory,
   owner   => icinga,
   group   => icinga,
   require => Cmmi['icinga-mysql']
 }
 
-file { '/usr/local/icinga-pgsql/etc/conf.d/test_config':
+file { '/usr/local/icinga-pgsql/etc/conf.d/test_config/':
   ensure  => directory,
   owner   => icinga,
   group   => icinga,

.vagrant-puppet/modules/cmmi/manifests/init.pp

@@ -19,14 +19,14 @@
 #
 # Sample Usage:
 #
-#  cmmi { 'example-software':
-#    url          => 'http://example-software.com/download/',
-#    output       => 'example-software.tar.gz',
-#    flags        => '--prefix=/opt/example-software',
-#    creates      => '/opt/example-software',
-#    make         => 'make && make install'
-#    make_timeout => 600
-#  }
+#   cmmi { 'example-software':
+#     url          => 'http://example-software.com/download/',
+#     output       => 'example-software.tar.gz',
+#     flags        => '--prefix=/opt/example-software',
+#     creates      => '/opt/example-software',
+#     make         => 'make && make install'
+#     make_timeout => 600
+#   }
 #
 define cmmi(
   $url,

.vagrant-puppet/modules/cpan/manifests/init.pp

@@ -1,7 +1,6 @@
 # Define: cpan
 #
-# Download and install Perl modules from the Perl Archive Network, the gateway to all things Perl.
-# The canonical location for Perl code and modules.
+# Download and install Perl modules from the Perl Archive Network, the canonical location for Perl code and modules.
 #
 # Parameters:
 #   [*creates*]  - target directory the software will install to.
@@ -11,12 +10,14 @@
 #
 # Requires:
 #
+#   Perl
+#
 # Sample Usage:
 #
-#  cpan { 'perl-module':
-#    creates => '/usr/local/share/perl5/perl-module',
-#    timeout => 600
-#  }
+#   cpan { 'perl-module':
+#     creates => '/usr/local/share/perl5/perl-module',
+#     timeout => 600
+#   }
 #
 define cpan(
   $creates,
@@ -29,9 +30,14 @@ define cpan(
     ensure => installed
   }
 
+  file { [ '/root/.cpan/', '/root/.cpan/CPAN/' ]:
+    ensure  => directory
+  }
+
   file { '/root/.cpan/CPAN/MyConfig.pm':
     content => template('cpan/MyConfig.pm.erb'),
-    require => Package['perl-CPAN']
+    require => [ Package['perl-CPAN'],
+                 File[[ '/root/.cpan/', '/root/.cpan/CPAN/' ]] ]
   }
 
   exec { "cpan-${name}":