Remove all use of params subclass that point to items provided in RHEL6

I've left in scl related params as I can envision those possibly
changing the future. The rest all point to RHEL6 items that I think we
can be sure won't change.

Author: sdodson

manifests/avahi.pp

@@ -14,8 +14,6 @@
 #  limitations under the License.
 #
 class openshift_origin::avahi {
-  include openshift_origin::params
-
   # TODO: Farm work out to Avahi module
 
   package { ['avahi-cname-manager']:

manifests/broker.pp

@@ -240,7 +240,7 @@
 
   exec { 'Broker gem dependencies':
     cwd     => '/var/www/openshift/broker/',
-    command => "${::openshift_origin::params::rm} -f Gemfile.lock && ${broker_bundle_show}",
+    command => "rm -f Gemfile.lock && ${broker_bundle_show}",
     before  => File['/var/www/openshift/broker/tmp'],
     require => [
       Package['openshift-origin-broker'],

manifests/console.pp

@@ -127,12 +127,12 @@
 
   exec { 'Console gem dependencies':
     cwd         => '/var/www/openshift/console/',
-    command     => "${::openshift_origin::params::rm} -f Gemfile.lock && \
+    command     => "rm -f Gemfile.lock && \
     ${console_bundle_show} && \
-    ${::openshift_origin::params::chown} apache:apache Gemfile.lock && \
-    ${::openshift_origin::params::rm} -rf tmp/cache/* && \
+    chown apache:apache Gemfile.lock && \
+    rm -rf tmp/cache/* && \
     ${console_asset_rake_cmd} && \
-    ${::openshift_origin::params::chown} -R apache:apache /var/www/openshift/console",
+    chown -R apache:apache /var/www/openshift/console",
     require     => Package['openshift-origin-console','httpd'],
     subscribe   => [
       Package['openshift-origin-console'],

manifests/install_method.pp

@@ -13,8 +13,6 @@
 #  limitations under the License.
 #
 class openshift_origin::install_method {
-  include openshift_origin::params
-
   stage { 'first':
     before => Stage['main'],
   }

manifests/msgserver.pp

@@ -16,8 +16,6 @@
 class openshift_origin::msgserver (
   $using_systemd = false
 ) {
-  include openshift_origin::params
-
   anchor { 'openshift_origin::msgserver_begin': } ->
   class { 'openshift_origin::firewall::activemq': } ->
   anchor { 'openshift_origin::msgserver_end': }

manifests/nameserver.pp

@@ -14,8 +14,6 @@
 #  limitations under the License.
 #
 class openshift_origin::nameserver {
-  include openshift_origin::params
-
   anchor { 'openshift_origin::nameserver_begin': } ->
   class { 'openshift_origin::firewall::dns': } ->
   anchor {'openshift_origin::nameserver_end': }

manifests/params.pp

@@ -14,34 +14,6 @@
 #  limitations under the License.
 #
 class openshift_origin::params {
-  $rm        = $::operatingsystem ? {
-    default  => '/bin/rm',
-  }
-
-  $chown     = $::operatingsystem ? {
-    default  => '/bin/chown',
-  }
-
-  $httxt2dbm = $::operatingsystem ? {
-    default  => '/usr/sbin/httxt2dbm',
-  }
-
-  $chmod     = $::operatingsystem ? {
-    default  => '/bin/chmod',
-  }
-
-  $grep      = $::operatingsystem ? {
-    default  => '/bin/grep',
-  }
-
-  $cat       = $::operatingsystem ? {
-    default  => '/bin/cat',
-  }
-
-  $mv        = $::operatingsystem ? {
-    default  => '/bin/mv',
-  }
-
   $ruby_scl_prefix = $::operatingsystem ? {
     default  => 'ruby193-',
   }
@@ -50,10 +22,6 @@
     default  => '/opt/rh/ruby193/root',
   }
 
-  $sysctl      = $::operatingsystem ? {
-    default  => '/sbin/sysctl',
-  }
-
   $node_shmmax = $::architecture ? {
     'x86_64' => 68719476736,
     default  => 33554432,

manifests/plugins/frontend/apache_mod_rewrite.pp

@@ -14,7 +14,6 @@
 #  limitations under the License.
 #
 class openshift_origin::plugins::frontend::apache_mod_rewrite {
-  include ::openshift_origin::params
   include openshift_origin::plugins::frontend::apache
 
   anchor { 'openshift_origin::plugins::fronted::apache_mod_rewrite_begin': } ->
@@ -39,13 +38,13 @@
     }
 
     exec { 'regen node routes':
-      command => "${::openshift_origin::params::cat} /etc/httpd/conf.d/openshift/nodes.txt /tmp/nodes.broker_routes.txt > /etc/httpd/conf.d/openshift/nodes.txt.new && \
-                  ${::openshift_origin::params::mv} /etc/httpd/conf.d/openshift/nodes.txt.new /etc/httpd/conf.d/openshift/nodes.txt && \
-                  ${::openshift_origin::params::httxt2dbm} -f DB -i /etc/httpd/conf.d/openshift/nodes.txt -o /etc/httpd/conf.d/openshift/nodes.db.new && \
-                  ${::openshift_origin::params::chown} root:apache /etc/httpd/conf.d/openshift/nodes.txt /etc/httpd/conf.d/openshift/nodes.db.new && \
-                  ${::openshift_origin::params::chmod} 750 /etc/httpd/conf.d/openshift/nodes.txt /etc/httpd/conf.d/openshift/nodes.db.new && \
-                  ${::openshift_origin::params::mv} -f /etc/httpd/conf.d/openshift/nodes.db.new /etc/httpd/conf.d/openshift/nodes.db",
-      unless  => "${::openshift_origin::params::grep} '__default__/broker' /etc/httpd/conf.d/openshift/nodes.txt 2>/dev/null",
+      command => "cat /etc/httpd/conf.d/openshift/nodes.txt /tmp/nodes.broker_routes.txt > /etc/httpd/conf.d/openshift/nodes.txt.new && \
+                  mv /etc/httpd/conf.d/openshift/nodes.txt.new /etc/httpd/conf.d/openshift/nodes.txt && \
+                  httxt2dbm -f DB -i /etc/httpd/conf.d/openshift/nodes.txt -o /etc/httpd/conf.d/openshift/nodes.db.new && \
+                  chown root:apache /etc/httpd/conf.d/openshift/nodes.txt /etc/httpd/conf.d/openshift/nodes.db.new && \
+                  chmod 750 /etc/httpd/conf.d/openshift/nodes.txt /etc/httpd/conf.d/openshift/nodes.db.new && \
+                  mv -f /etc/httpd/conf.d/openshift/nodes.db.new /etc/httpd/conf.d/openshift/nodes.db",
+      unless  => "grep '__default__/broker' /etc/httpd/conf.d/openshift/nodes.txt 2>/dev/null",
       require => File['broker and console route for node'],
     }
   }

manifests/role.pp

@@ -14,7 +14,6 @@
 #  limitations under the License.
 #
 class openshift_origin::role {
-  include openshift_origin::params
   include openshift_origin::install_method
   require openshift_origin::firewall::ssh
 

templates/console/console.conf.erb

@@ -132,6 +132,8 @@ REMOTE_USER_COPY_HEADERS=X-Remote-User
 
 #GITHUB_ORIGIN_SERVER_REPO=origin-server
 
+#ORIGIN_SERVER_SRPM_URL=http://mirror.openshift.com/pub/openshift-origin/nightly/rhel-6/latest/SRPMS/
+
 #RED_HAT_ACCOUNT_URL=https://www.redhat.com/wapps/ugc
 
 #[email protected]