summaryrefslogtreecommitdiff
path: root/kitchen-tests/cookbooks
diff options
context:
space:
mode:
Diffstat (limited to 'kitchen-tests/cookbooks')
-rw-r--r--kitchen-tests/cookbooks/base/attributes/default.rb2
-rw-r--r--kitchen-tests/cookbooks/base/recipes/default.rb10
2 files changed, 8 insertions, 4 deletions
diff --git a/kitchen-tests/cookbooks/base/attributes/default.rb b/kitchen-tests/cookbooks/base/attributes/default.rb
index f3bcb4f21a..ef273c969c 100644
--- a/kitchen-tests/cookbooks/base/attributes/default.rb
+++ b/kitchen-tests/cookbooks/base/attributes/default.rb
@@ -5,8 +5,6 @@ puts "CHEF SUGAR THINKS WE ARE ON RHEL" if rhel?
# ubuntu cookbook overrides
#
-default["ubuntu"]["archive_url"] = "http://us-west-2.ec2.archive.ubuntu.com/ubuntu"
-default["ubuntu"]["security_url"] = "http://us-west-2.ec2.archive.ubuntu.com/ubuntu"
default["ubuntu"]["include_source_packages"] = true
default["ubuntu"]["components"] = "main restricted universe multiverse"
diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/base/recipes/default.rb
index be939b78e6..053a689b27 100644
--- a/kitchen-tests/cookbooks/base/recipes/default.rb
+++ b/kitchen-tests/cookbooks/base/recipes/default.rb
@@ -7,13 +7,16 @@
hostname "chef-travis-ci.chef.io"
-if node[:platform_family] == "debian"
+if node["platform_family"] == "debian"
include_recipe "ubuntu"
apt_update "packages"
end
-if %w{rhel fedora}.include?(node[:platform_family])
+if %w{rhel fedora}.include?(node["platform_family"])
include_recipe "selinux::disabled"
+end
+
+if node["platform_family"] == "rhel"
include_recipe "yum-epel"
end
@@ -33,6 +36,9 @@ include_recipe "chef-client::delete_validation"
include_recipe "chef-client::config"
include_recipe "chef-client"
+# hack needed for debian-7 on docker
+directory "/var/run/sshd"
+
include_recipe "openssh"
include_recipe "nscd"