Merge branch 'feature/vagrant-icinga-box-9453'

resolves #9453

.puppet/modules/openldap/manifests/init.pp

@@ -24,14 +24,11 @@ class openldap {
   }
 
   if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
-    ['core', 'cosine', 'inetorgperson', 'nis', 'misc', 'openldap'].each |String $schema| {
-      exec { "slapd-schema-${schema}":
-        command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${schema}.ldif",
-        group   => 'root',
-        require => Package['openldap-servers'],
-        unless  => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${schema}.ldif -print -quit)\"",
-        user    => 'root',
-      }
-    }
+    openldap::schema{ 'core': }
+    -> openldap::schema{ 'cosine': }
+    -> openldap::schema{ 'inetorgperson': }
+    -> openldap::schema{ 'nis': }
+    -> openldap::schema{ 'misc': }
+    -> openldap::schema{ 'openldap': }
   }
 }

.puppet/modules/openldap/manifests/schema.pp

@@ -0,0 +1,24 @@
+# define: openldap::schema
+#
+#   Install a schema.
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+define openldap::schema {
+
+  include openldap
+
+  exec { "openldap-schema-${name}":
+    command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${name}.ldif",
+    group   => 'root',
+    require => Service['slapd'],
+    unless  => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${name}.ldif -print -quit)\"",
+    user    => 'root',
+  }
+}

.puppet/modules/php/manifests/init.pp

@@ -24,7 +24,5 @@ class php {
     require => Package['apache'],
   }
 
-  php::phpd { ['error_reporting', 'timezone', 'xdebug_settings' ]:
-    require => Package['php'],
-  }
+  php::phpd { ['error_reporting', 'timezone', 'xdebug_settings' ]: }
 }

.puppet/modules/php/manifests/phpd.pp

@@ -17,5 +17,6 @@ define php::phpd {
   file { "/etc/php.d/$name.ini":
     content => template("php/$name.ini.erb"),
     notify  => Service['apache'],
+    require => Package['php'],
   }
 }

Vagrantfile

@@ -22,9 +22,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :shell, :path => ".puppet/manifests/puppet.sh"
 
   config.vm.provider :virtualbox do |v, override|
-    override.vm.box = "puppetlabs/centos-7.0-64-puppet"
+    override.vm.box = "centos-71-x64-vbox"
+    override.vm.box_url = "http://boxes.icinga.org/centos-71-x64-vbox.box"
 
     v.customize ["modifyvm", :id, "--memory", "1024"]
+    v.customize ["modifyvm", :id, "--cpus", "2"]
   end
 
   config.vm.provider :parallels do |p, override|