Fixing el7. Adding some polish

centos-7.0.json

@@ -46,7 +46,8 @@
         "scripts/enterprise/base.sh",
         "scripts/vagrant-key.sh",
         "scripts/enterprise/virtualbox.sh",
-        "scripts/enterprise/repos.sh"
+        "scripts/enterprise/repos.sh",
+        "scripts/enterprise/el7.sh"
       ]
    },
    {

puppet/modules/puppetmaster/manifests/init.pp

@@ -20,31 +20,34 @@
   # Fix up the reports directory
   file { '/var/lib/puppet/reports/':
     ensure => directory,
-    owner => 'puppet',
+    owner  => 'puppet',
   }
 
   # Set up rack directories and puppetmaster in passenger
   file { '/usr/share/puppet/rack': 
     ensure => directory, 
-    owner => "puppet", 
+    owner  => "puppet", 
   } ->
   file { '/usr/share/puppet/rack/puppetmaster': 
     ensure => directory, 
-    owner => "puppet", 
+    owner  => "puppet", 
   } ->
   file { '/usr/share/puppet/rack/puppetmaster/public': 
     ensure => directory, 
-    owner => "puppet", 
-    group => "puppet", 
+    owner  => "puppet", 
+    group  => "puppet", 
   } ->
   file { '/usr/share/puppet/rack/puppetmaster/config.ru': 
-    source => 'puppet:///modules/puppetmaster/config.ru', 
-    owner => "puppet", 
+    source  => 'puppet:///modules/puppetmaster/config.ru', 
+    owner   => "puppet", 
+    mode    => '0664',
     require => File['/usr/share/puppet/rack/puppetmaster'], 
   }
 
   # Apache config
   file { '/etc/httpd/conf.d/puppetmaster.conf':
+    owner  => 'root',
+    mode   => '0664',
     source => 'puppet:///modules/puppetmaster/puppetmaster.conf',
   }
 }

puppetmaster.json

@@ -61,7 +61,8 @@
       "type": "shell",
       "execute_command": "echo '{{user `ssh_password`}}'|sudo -S sh '{{.Path}}'",
       "scripts": [
-        "scripts/cleanup.sh"
+        "scripts/cleanup.sh",
+        "scripts/puppet-cleanup.sh"
       ]
     }
   ],

scripts/debian/virtualbox-trusty.sh

@@ -0,0 +1,8 @@
+apt-get install -y binutils cpp cpp-4.8 fakeroot gcc gcc-4.8 libasan0 libatomic1 libc-dev-bin libc6-dev libcloog-isl4 libfakeroot libgcc-4.8-dev libgmp10 libgomp1 libisl10 libitm1 libmpc3 libmpfr4 libquadmath0 libtsan0 linux-libc-dev make manpages-dev patch
+
+mount -o loop VBoxGuestAdditions.iso /mnt
+yes|sh /mnt/VBoxLinuxAdditions.run
+umount /mnt
+rm -f VBoxLinuxAdditions.iso
+
+apt-get remove -y binutils cpp cpp-4.8 fakeroot gcc gcc-4.8 libasan0 libatomic1 libc-dev-bin libc6-dev libcloog-isl4 libfakeroot libgcc-4.8-dev libgmp10 libgomp1 libisl10 libitm1 libmpc3 libmpfr4 libquadmath0 libtsan0 linux-libc-dev make manpages-dev patch

scripts/enterprise/el7.sh

@@ -0,0 +1,8 @@
+# Override udev net-rules
+mkdir -p /etc/udev/rules.d/60-net.rules
+
+# Add "net.ifnames=0" and "biosdevname=0" 
+sed -i -e 's/quiet/net.ifnames=0 biosdevname=0 quiet/' /etc/default/grub
+grub2-mkconfig -o /boot/grub2/grub.cfg
+
+rm -f /etc/sysconfig/network-scripts/ifcfg-e*

scripts/puppet-cleanup.sh

@@ -0,0 +1,2 @@
+mkdir -p /var/lib/puppet/reports
+chown -R puppet:puppet /var/lib/puppet/reports