Merge branch 'stable'

* stable: (maint) Use activerecord 2.2.3 on CentOS 5
puppetlabs · May 6, 2013 · 8c0e1b3 · 8c0e1b3
2 parents 5166625 + 761de6b
commit 8c0e1b3
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/acceptance/tests/store_configs/enc_provides_node_when_storeconfigs_enabled.rb b/acceptance/tests/store_configs/enc_provides_node_when_storeconfigs_enabled.rb
@@ -31,12 +31,21 @@
 on master, "chmod -R g+rwX #{testdir}"
 
 create_remote_file master, "#{testdir}/setup.pp", <<END
+
+$active_record_version = $osfamily ? {
+  RedHat => $lsbmajdistrelease ? {
+    5       => '2.2.3',
+    default => '3.0.20',
+  },
+  default => '3.0.20',
+}
+
 package {
   rubygems:
     ensure => present;
 
   activerecord:
-    ensure => '3.0.20',
+    ensure => $active_record_version,
     provider => 'gem',
     require => Package[rubygems]
 }