Enables fedora testing

FC18 put the SATA drives before the boot drive, so I moved them onto the same IDE controller
FC19 has a node.platform_family of '', so it fails
FC20 doesn't have ceph packages yet

The FC18 test fails after completely running, because the OSDs don't start due to a lack of udev hook
Running ceph-disk-activate manually works and starts the OSDs and makes the cluster healthy

diff --git a/.kitchen.yml b/.kitchen.yml
index ed817322a8b272375ffc6238ecaec1f65feb3bec..00492b92d5eb468ab045221cd1f88d8120923581 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -13,6 +13,7 @@ platforms:
     - recipe[apt]
 - name: centos-6.5
 - name: centos-5.10
+- name: fedora-18
 
 provisioner:
     name: chef_zero

diff --git a/recipes/repo.rb b/recipes/repo.rb
index 986355a8f6cd51f82500505606125140f90076d2..6ef37de1f05572c32da8a2fafdfd613933e70f36 100644 (file)
--- a/recipes/repo.rb
+++ b/recipes/repo.rb
@@ -1,7 +1,7 @@
 case node['platform_family']
 when 'debian'
   include_recipe 'ceph::apt'
-when 'rhel', 'suse'
+when 'rhel', 'suse', 'fedora'
   include_recipe 'ceph::rpm'
 else
   fail 'not supported'

diff --git a/test/integration/Vagrantfile.erb b/test/integration/Vagrantfile.erb
index b3d22a15713ba98dce8823374010fcd6922005bd..8266d08a08107756e4215dfa0216890e64aef9c2 100644 (file)
--- a/test/integration/Vagrantfile.erb
+++ b/test/integration/Vagrantfile.erb
@@ -1,13 +1,10 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "<%= config[:box] %>"
   config.vm.box_url = "<%= config[:box_url ]%>"
-  config.vm.provider :virtualbox do |vb|
-    vb.customize [ "storagectl", :id, "--name", "SATA Controller", "--add", "sata", "--controller", "IntelAHCI" ]
-  end
   (0..2).each do |d|
     config.vm.provider :virtualbox do |vb|
       vb.customize [ "createhd", "--filename", "disk-#{d}", "--size", "1000" ]
-      vb.customize [ "storageattach", :id, "--storagectl", "SATA Controller", "--port", 3+d, "--device", 0, "--type", "hdd", "--medium", "disk-#{d}.vdi" ]
+      vb.customize [ "storageattach", :id, "--storagectl", "IDE Controller", "--device", (1+d)/2, "--port", (1+d)%2, "--type", "hdd", "--medium", "disk-#{d}.vdi" ]
     end
   end
 end