attach disks when running integration tests

The vagrant instances run for integration tests are attached a 10GB thin
provisioned disk. It will show on /dev/sdb an allow for tests when
creating an OSD on a physical device.

This feature has been added to a fork of rspec-system (
6b1860fc5a
) which is hosted on gitorious instead of github. There is no hope of
getting the patch accepted because rspec-system is retired.

The test instances are renamed (first.vm => first, second.vm => second)
without a dot in their name because it makes it easier to derive a disk
name that does not conflict with the restrictions imposed by vagrant on
disk file names.

Change-Id: I1964c7f6160bd16b92a7e4fd6dc9444c22cfd60b
Signed-off-by: Loic Dachary <loic@dachary.org>

.nodeset.yml

@@ -1,17 +1,22 @@
 default_set: 'two-ubuntu-server-12042-x64'
 sets:
   'two-ubuntu-server-12042-x64':
-    default_node: 'first.vm'
+    default_node: 'first'
     nodes:
-      'first.vm':
+      'first':
         prefab: 'ubuntu-server-12042-x64'
         options:
                  ip: '10.11.12.2'
-      'second.vm':
+                 disk: 10
+      'second':
         prefab: 'ubuntu-server-12042-x64'
         options:
                  ip: '10.11.12.3'
+                 disk: 10
   'one-ubuntu-server-12042-x64':
     nodes:
-      'first.vm':
+      'first':
         prefab: 'ubuntu-server-12042-x64'
+        options:
+                 ip: '10.11.12.2'
+                 disk: 10

Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
   gem 'puppet-lint', '~> 0.3.2'
-  gem 'rspec-system', '= 2.8.0'
+  gem 'rspec-system', :git => 'https://git.gitorious.org/rspec-system/rspec-system.git', :branch => 'master'
   gem 'rspec-system-puppet', '= 2.2.1'
 end
 

spec/spec_helper_system.rb

@@ -30,7 +30,7 @@ RSpec.configure do |c|
   c.include RSpecSystemPuppet::Helpers
 
   c.before :suite do
-    [ 'first.vm', 'second.vm' ].each do |vm|
+    [ 'first', 'second' ].each do |vm|
       puppet_install(:node => vm)
       puppet_module_install(:source => proj_root,
                             :module_name => 'ceph',

spec/system/ceph_mon_spec.rb

@@ -207,7 +207,7 @@ describe 'ceph::mon' do
               }
           EOS
 
-          puppet_apply(:node => "#{mon}.vm", :code => pp) do |r|
+          puppet_apply(:node => "#{mon}", :code => pp) do |r|
             r.exit_code.should_not == 1
             r.refresh
             r.exit_code.should_not == 1
@@ -230,7 +230,7 @@ describe 'ceph::mon' do
             }
           EOS
 
-          puppet_apply(:node => "#{mon}.vm", :code => pp) do |r|
+          puppet_apply(:node => "#{mon}", :code => pp) do |r|
             r.exit_code.should_not == 1
           end