Merge pull request #114 from kraman/bugfix

Fix repository base for RHEL.

Author: kraman

manifests/init.pp

@@ -351,7 +351,10 @@
 class openshift_origin (
   $roles                                = ['broker','node','activemq','datastore','named'],
   $install_method                       = 'yum',
-  $repos_base                           = 'https://mirror.openshift.com/pub/origin-server/nightly/fedora-19',
+  $repos_base                           = $::operatingsystem ? {
+                                            'Fedora' => 'https://mirror.openshift.com/pub/origin-server/nightly/fedora-19',
+                                            default  => 'https://mirror.openshift.com/pub/origin-server/nightly/rhel-6',
+                                          },
   $override_install_repo                = undef,
   $os_repo                              = undef,
   $os_updates_repo                      = undef,

manifests/modprobe.pp

@@ -21,6 +21,14 @@
       }
     }
     default: {
+      file { '/etc/sysconfig/modules/bridge.modules':
+        content => "#!/bin/bash\nexec /sbin/modprobe bridge >/dev/null 2>&1",
+        mode    => '700',
+      }
+      
+      exec { 'load bridge module':
+        command => '/sbin/modprobe bridge',
+      }
     }
   }
-}
+}

manifests/node.pp

@@ -64,8 +64,8 @@
   }
 
   augeas { 'Tune Sysctl knobs':
-    context => "/files/etc/sysctl.conf",
-    changes => [
+    context  => "/files/etc/sysctl.conf",
+    changes  => [
       # Increase kernel semaphores to accomodate many httpds.
       "set kernel.sem '250  32000 32  4096'",
 
@@ -87,7 +87,7 @@
       "set kernel.msgmnb 65536",
       "set kernel.msgmax 65536",
     ],
-    notify => Exec['Reload sysctl']
+    notify  => Exec['Reload sysctl'],
   }
 
   # Reload sysctl.conf to get the new settings.