Merge pull request #42 from joshbronson/master_patches

Master patches
infochimps-labs · Jul 23, 2014 · 7246331 · 7246331
2 parents e6fe379 + 3216b8c
commit 7246331
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cookbooks/cloud_utils/attributes/default.rb b/cookbooks/cloud_utils/attributes/default.rb
@@ -1 +1 @@
-default[:cloud_utils][:srp][:environment] = 'release_7'
+default[:cloud_utils][:srp][:environment] = 'release_6.1'
diff --git a/cookbooks/cloud_utils/recipes/srp_repo.rb b/cookbooks/cloud_utils/recipes/srp_repo.rb
@@ -10,9 +10,11 @@
     end
 elsif platform_family?('rhel')
       yum_repository "srp-rhel" do
-        name "infochimps-#{environment}"
+        name "srp-rhel"
+        gpgcheck false
         url "https://s3.amazonaws.com/srp-rhel.chimpy.us/#{environment}/"
         # key "RPM-GPG-KEY-chimps"
         action :add
       end
+      Chef::Config[:yum_timeout] = 2400 # set yum timeout to 40 mins while we're in here
 end