Added compute_stubs into before filter

This makes our testing consistent with our other cookbooks.
Also, added require_relative two 2 tests which were missing it.

Change-Id: Iabebc6d658d9b5e6c3ccc3f9fd10b56c636fd304

spec/api-ec2-redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::api-ec2" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::api-ec2"
     end

spec/api-ec2_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::api-ec2" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::api-ec2"
     end

spec/api-metadata-redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::api-metadata" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::api-metadata"
     end

spec/api-metadata_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::api-metadata" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::api-metadata"
     end

spec/api-os-compute-redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::api-os-compute" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::api-os-compute"
     end

spec/api-os-compute_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::api-os-compute" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::api-os-compute"
     end

spec/ceilometer-agent-central-opensuse_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::ceilometer-agent-central" do
+  before { compute_stubs }
   describe "opensuse" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
       @chef_run.converge "openstack-compute::ceilometer-agent-central"
     end

spec/ceilometer-agent-central_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::ceilometer-agent-central" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::ceilometer-agent-central"
     end

spec/ceilometer-agent-compute-opensuse_spec.rb

@@ -1,9 +1,9 @@
-require "spec_helper"
+require_relative "spec_helper"
 
 describe "openstack-compute::ceilometer-agent-compute" do
+  before { compute_stubs }
   describe "opensuse" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
       @chef_run.converge "openstack-compute::ceilometer-agent-compute"
     end

spec/ceilometer-agent-compute_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::ceilometer-agent-compute" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::ceilometer-agent-compute"
     end

spec/ceilometer-collector-opensuse_spec.rb

@@ -1,9 +1,9 @@
-require "spec_helper"
+require_relative "spec_helper"
 
 describe "openstack-compute::ceilometer-collector" do
+  before { compute_stubs }
   describe "opensuse" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
       @chef_run.converge "openstack-compute::ceilometer-collector"
     end

spec/ceilometer-collector_spec.rb

@@ -1,9 +1,9 @@
-require "spec_helper"
+require_relative "spec_helper"
 
 describe "openstack-compute::ceilometer-collector" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::ceilometer-collector"
     end

spec/ceilometer-common-opensuse_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::ceilometer-common" do
+  before { compute_stubs }
   describe "opensuse" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
       @chef_run.converge "openstack-compute::ceilometer-common"
     end

spec/ceilometer-common_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::ceilometer-common" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @node = @chef_run.node
       @node.set["openstack"]["compute"]["ceilometer"]["syslog"]["use"] = true

spec/compute-redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::compute" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::compute"
     end

spec/compute_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::compute" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::compute"
     end

spec/conductor_redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::conductor" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::conductor"
     end

spec/conductor_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::conductor" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::conductor"
     end

spec/libvirt-opensuse_spec.rb

@@ -2,6 +2,7 @@ require_relative "spec_helper"
 
 describe "openstack-compute::libvirt" do
   before do
+    compute_stubs
     # This is stubbed b/c systems without '/boot/grub/menul.lst`,
     # fail to pass tests.  This can be removed if a check verifies
     # the files existence prior to File#open.
@@ -11,7 +12,6 @@ describe "openstack-compute::libvirt" do
 
   describe "suse" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
       @chef_run.converge "openstack-compute::libvirt"
     end

spec/libvirt-redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::libvirt" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::libvirt"
     end

spec/libvirt_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::libvirt" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::libvirt"
     end

spec/network-redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::network" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::network"
     end

spec/network_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::network" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::network"
     end

spec/nova-cert-redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::nova-cert" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::nova-cert"
     end

spec/nova-cert_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::nova-cert" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::nova-cert"
     end

spec/nova-common-redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::nova-common" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::nova-common"
     end

spec/nova-common_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::nova-common" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @node = @chef_run.node
       @node.set["openstack"]["compute"]["syslog"]["use"] = true

spec/nova-setup_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::nova-setup" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::nova-setup"
     end

spec/scheduler-redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::scheduler" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::scheduler"
     end

spec/scheduler_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::scheduler" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::scheduler"
     end

spec/vncproxy-redhat_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::vncproxy" do
+  before { compute_stubs }
   describe "redhat" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
       @chef_run.converge "openstack-compute::vncproxy"
     end

spec/vncproxy_spec.rb

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 describe "openstack-compute::vncproxy" do
+  before { compute_stubs }
   describe "ubuntu" do
     before do
-      compute_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       @chef_run.converge "openstack-compute::vncproxy"
     end