Cleanup node['cpu']['total'] work-around for fauxhai

The fauxhai fix for the cpu stanza has merged and is available in fauxhai version 2.1.0 so reverting the workaround patch and ensuring fauxhai 2.1.0 is used. - Remove the node.set for ['cpu']['total'] - Adjust the Gemfile to use fauxhai 2.1.0 - Adjust the Gemfile.lock Change-Id: Ib1fc86af1306d5443721400589a8c830263c0767 Addresses: blueprint fauxhai-cleanup
2014-02-18 11:12:58 +00:00 · 2014-02-18 11:12:58 +00:00 · 9ee4c9e65a
parent e0144c0fe5
commit 9ee4c9e65a
15 changed files with 16 additions and 122 deletions
--- a/1
+++ b/1
@ -8,3 +8,4 @@ gem 'chefspec', '~> 3.1.4'
 gem 'foodcritic', '~> 3.0.3'
 gem 'strainer'
 gem 'rubocop', '~> 0.18.1'
+gem 'fauxhai', '>= 2.1.0'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -64,7 +64,6 @@ GEM
      rack
    chefspec (3.1.4)
      chef (~> 11.0)
-      fauxhai (~> 2.0)
      i18n (>= 0.6.9, < 1.0.0)
      rspec (~> 2.14)
    chozo (0.6.1)
@ -76,7 +75,7 @@ GEM
    erubis (2.7.0)
    faraday (0.8.8)
      multipart-post (~> 1.2.0)
-    fauxhai (2.0.1)
+    fauxhai (2.1.0)
      net-ssh
      ohai
    ffi (1.9.3)
@ -229,6 +228,7 @@ DEPENDENCIES
  berkshelf (~> 2.0.10)
  chef (~> 11.8)
  chefspec (~> 3.1.4)
+  fauxhai (>= 2.1.0)
  foodcritic (~> 3.0.3)
  json (<= 1.7.7)
  rubocop (~> 0.18.1)
--- a/spec/api-opensuse_spec.rb
+++ b/spec/api-opensuse_spec.rb
@ -8,10 +8,7 @@ describe 'openstack-block-storage::api' do
  before { block_storage_stubs }
  describe 'suse' do
    before do
-      @chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      @chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
      @chef_run.converge 'openstack-block-storage::api'
    end

@ -27,8 +24,6 @@ describe 'openstack-block-storage::api' do
      chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
      node = chef_run.node
      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      chef_run.converge 'openstack-block-storage::api'

      expect(chef_run).to upgrade_package 'python-psycopg2'
--- a/spec/api-redhat_spec.rb
+++ b/spec/api-redhat_spec.rb
@ -8,10 +8,7 @@ describe 'openstack-block-storage::api' do
  before { block_storage_stubs }
  describe 'redhat' do
    before do
-      @chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      @chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
      @chef_run.converge 'openstack-block-storage::api'
    end

@ -27,8 +24,6 @@ describe 'openstack-block-storage::api' do
      chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
      node = chef_run.node
      node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      chef_run.converge 'openstack-block-storage::api'

      ['db2-odbc', 'python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
@ -40,8 +35,6 @@ describe 'openstack-block-storage::api' do
      chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
      node = chef_run.node
      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      chef_run.converge 'openstack-block-storage::api'

      expect(chef_run).to upgrade_package 'python-psycopg2'
--- a/spec/api_spec.rb
+++ b/spec/api_spec.rb
@ -10,8 +10,6 @@ describe 'openstack-block-storage::api' do
    before do
      @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
        n.set['openstack']['block-storage']['syslog']['use'] = true
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
      end
      @chef_run.converge 'openstack-block-storage::api'
    end
@ -19,10 +17,7 @@ describe 'openstack-block-storage::api' do
    expect_runs_openstack_common_logging_recipe

    it 'does not run logging recipe' do
-      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
      chef_run.converge 'openstack-block-storage::api'

      expect(chef_run).not_to include_recipe 'openstack-common::logging'
@ -41,8 +36,6 @@ describe 'openstack-block-storage::api' do
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
      node = chef_run.node
      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      chef_run.converge 'openstack-block-storage::api'

      expect(chef_run).to upgrade_package 'python-psycopg2'
@ -80,10 +73,7 @@ describe 'openstack-block-storage::api' do
      end

      it 'does not run logging recipe' do
-        chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-          # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-          n.set['cpu']['total'] = 1
-        end
+        chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
        chef_run.converge 'openstack-block-storage::api'

        expect(chef_run).not_to render_file(@file).with_content('log_config = /etc/openstack/logging.conf')
@ -94,8 +84,6 @@ describe 'openstack-block-storage::api' do
          n.set['openstack']['block-storage']['volume'] = {
            'driver' => 'cinder.volume.drivers.rbd.RBDDriver'
          }
-          # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-          n.set['cpu']['total'] = 1
        end
        chef_run.converge 'openstack-block-storage::api'

@ -108,8 +96,6 @@ describe 'openstack-block-storage::api' do
          n.set['openstack']['block-storage']['volume'] = {
            'driver' => 'cinder.volume.drivers.netapp.NetAppISCSIDriver'
          }
-          # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-          n.set['cpu']['total'] = 1
        end
        chef_run.converge 'openstack-block-storage::api'

--- a/spec/cinder_common-redhat_spec.rb
+++ b/spec/cinder_common-redhat_spec.rb
@ -11,8 +11,6 @@ describe 'openstack-block-storage::cinder-common' do
      n.set['openstack']['mq'] = {
        'host' => '127.0.0.1'
      }
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      n.set['cpu']['total'] = 1
      n.set['openstack']['block-storage']['syslog']['use'] = true
    end
    @chef_run.converge 'openstack-block-storage::cinder-common'
--- a/spec/cinder_common-suse_spec.rb
+++ b/spec/cinder_common-suse_spec.rb
@ -12,8 +12,6 @@ describe 'openstack-block-storage::cinder-common' do
        'host' => '127.0.0.1'
      }
      n.set['openstack']['block-storage']['syslog']['use'] = true
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      n.set['cpu']['total'] = 1
    end
    @chef_run.converge 'openstack-block-storage::cinder-common'
  end
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@ -11,8 +11,6 @@ describe 'openstack-block-storage::cinder-common' do
      n.set['openstack']['mq'] = {
        'host' => '127.0.0.1'
      }
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      n.set['cpu']['total'] = 1
      n.set['openstack']['mq']['block-storage']['rabbit']['notification_topic'] = 'rabbit_topic'
    end
    @chef_run.converge 'openstack-block-storage::cinder-common'
@ -99,8 +97,6 @@ describe 'openstack-block-storage::cinder-common' do
    it 'has log_config when syslog is true' do
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
        n.set['openstack']['block-storage']['syslog']['use'] = true
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
      end
      chef_run.converge 'openstack-block-storage::cinder-common'

@ -135,8 +131,6 @@ describe 'openstack-block-storage::cinder-common' do
      before do
        @chef_run = ::ChefSpec::Runner.new(::UBUNTU_OPTS) do |n|
          n.set['openstack']['mq']['block-storage']['rabbit']['ha'] = true
-          # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-          n.set['cpu']['total'] = 1
        end
        @chef_run.converge 'openstack-block-storage::cinder-common'
      end
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@ -7,10 +7,7 @@ require_relative 'spec_helper'
 describe 'openstack-block-storage::identity_registration' do
  before do
    block_storage_stubs
-    @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      n.set['cpu']['total'] = 1
-    end
+    @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
    @chef_run.converge 'openstack-block-storage::identity_registration'
  end

--- a/spec/scheduler-redhat_spec.rb
+++ b/spec/scheduler-redhat_spec.rb
@ -8,10 +8,7 @@ describe 'openstack-block-storage::scheduler' do
  before { block_storage_stubs }
  describe 'redhat' do
    before do
-      @chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      @chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
      @chef_run.converge 'openstack-block-storage::scheduler'
    end

@ -20,10 +17,7 @@ describe 'openstack-block-storage::scheduler' do
    end

    it 'does not upgrade stevedore' do
-      chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
      chef_run.converge 'openstack-block-storage::scheduler'

      expect(chef_run).not_to upgrade_python_pip 'stevedore'
@ -37,8 +31,6 @@ describe 'openstack-block-storage::scheduler' do
      chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
      node = chef_run.node
      node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      chef_run.converge 'openstack-block-storage::scheduler'

      ['db2-odbc', 'python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
@ -50,8 +42,6 @@ describe 'openstack-block-storage::scheduler' do
      chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
      node = chef_run.node
      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      chef_run.converge 'openstack-block-storage::scheduler'

      expect(chef_run).to upgrade_package 'python-psycopg2'
--- a/spec/scheduler-suse_spec.rb
+++ b/spec/scheduler-suse_spec.rb
@ -8,10 +8,7 @@ describe 'openstack-block-storage::scheduler' do
  before { block_storage_stubs }
  describe 'suse' do
    before do
-      @chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      @chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
      @chef_run.converge 'openstack-block-storage::scheduler'
    end

@ -20,10 +17,7 @@ describe 'openstack-block-storage::scheduler' do
    end

    it 'does not upgrade stevedore' do
-      chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
      chef_run.converge 'openstack-block-storage::scheduler'

      expect(chef_run).not_to upgrade_python_pip 'stevedore'
@ -37,8 +31,6 @@ describe 'openstack-block-storage::scheduler' do
      chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
      node = chef_run.node
      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      chef_run.converge 'openstack-block-storage::scheduler'

      expect(chef_run).to upgrade_package 'python-psycopg2'
--- a/spec/scheduler_spec.rb
+++ b/spec/scheduler_spec.rb
@ -10,8 +10,6 @@ describe 'openstack-block-storage::scheduler' do
    before do
      @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
        n.set['openstack']['block-storage']['syslog']['use'] = true
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
      end
      @chef_run.converge 'openstack-block-storage::scheduler'
    end
@ -19,10 +17,7 @@ describe 'openstack-block-storage::scheduler' do
    expect_runs_openstack_common_logging_recipe

    it 'does not run logging recipe' do
-      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
      chef_run.converge 'openstack-block-storage::scheduler'

      expect(chef_run).not_to include_recipe 'openstack-common::logging'
@ -40,8 +35,6 @@ describe 'openstack-block-storage::scheduler' do
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
      node = chef_run.node
      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      chef_run.converge 'openstack-block-storage::scheduler'

      expect(chef_run).to upgrade_package 'python-psycopg2'
@ -69,8 +62,6 @@ describe 'openstack-block-storage::scheduler' do
        .with(:node, 'roles:os-block-storage-scheduler')
        .and_return([OpenStruct.new(name: 'fauxhai.local')])
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
        n.set['openstack']['metering'] = true
      end
      chef_run.converge 'openstack-block-storage::scheduler'
@ -92,8 +83,6 @@ describe 'openstack-block-storage::scheduler' do
        .with(:node, 'roles:os-block-storage-scheduler')
        .and_return([OpenStruct.new(name: 'foobar')])
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
        n.set['openstack']['metering'] = true
        crontests.each do |k, v|
          n.set['openstack']['block-storage']['cron'][k.to_s] = v
--- a/spec/volume-redhat_spec.rb
+++ b/spec/volume-redhat_spec.rb
@ -8,10 +8,7 @@ describe 'openstack-block-storage::volume' do
  before { block_storage_stubs }
  describe 'redhat' do
    before do
-      @chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      @chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
      @chef_run.converge 'openstack-block-storage::volume'
    end

@ -22,8 +19,6 @@ describe 'openstack-block-storage::volume' do
    it 'installs db2 python packages if explicitly told' do
      chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
      node = chef_run.node
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
      chef_run.converge 'openstack-block-storage::volume'

@ -35,8 +30,6 @@ describe 'openstack-block-storage::volume' do
    it 'installs postgresql python packages if explicitly told' do
      chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
      node = chef_run.node
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
      chef_run.converge 'openstack-block-storage::volume'

@ -64,8 +57,6 @@ describe 'openstack-block-storage::volume' do
    it 'installs nfs packages' do
      chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS do |n|
        n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.netapp.nfs.NetAppDirect7modeNfsDriver'
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
      end
      chef_run.converge 'openstack-block-storage::volume'

--- a/spec/volume-suse_spec.rb
+++ b/spec/volume-suse_spec.rb
@ -8,10 +8,7 @@ describe 'openstack-block-storage::volume' do
  before { block_storage_stubs }
  describe 'suse' do
    before do
-      @chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      @chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
      @chef_run.converge 'openstack-block-storage::volume'
    end

@ -26,8 +23,6 @@ describe 'openstack-block-storage::volume' do
    it 'installs postgresql python packages if explicitly told' do
      chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
      node = chef_run.node
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
      chef_run.converge 'openstack-block-storage::volume'

@ -54,8 +49,6 @@ describe 'openstack-block-storage::volume' do

    it 'installs nfs packages' do
      chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
        n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.netapp.nfs.NetAppDirect7modeNfsDriver'
      end
      chef_run.converge 'openstack-block-storage::volume'
--- a/spec/volume_spec.rb
+++ b/spec/volume_spec.rb
@ -10,8 +10,6 @@ describe 'openstack-block-storage::volume' do
    before do
      @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
        n.set['openstack']['block-storage']['syslog']['use'] = true
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
      end
      @chef_run.converge 'openstack-block-storage::volume'
    end
@ -19,10 +17,7 @@ describe 'openstack-block-storage::volume' do
    expect_runs_openstack_common_logging_recipe

    it 'does not run logging recipe' do
-      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
-      end
+      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
      chef_run.converge 'openstack-block-storage::volume'

      expect(chef_run).not_to include_recipe 'openstack-common::logging'
@ -39,8 +34,6 @@ describe 'openstack-block-storage::volume' do
    it 'installs postgresql python packages if explicitly told' do
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
      node = chef_run.node
-      # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-      node.set['cpu']['total'] = 1
      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
      chef_run.converge 'openstack-block-storage::volume'

@ -54,8 +47,6 @@ describe 'openstack-block-storage::volume' do

    it 'installs nfs packages' do
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
        n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.netapp.nfs.NetAppDirect7modeNfsDriver'
      end
      chef_run.converge 'openstack-block-storage::volume'
@ -65,8 +56,6 @@ describe 'openstack-block-storage::volume' do

    it 'creates the nfs mount point' do
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
        n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.netapp.nfs.NetAppDirect7modeNfsDriver'
      end
      chef_run.converge 'openstack-block-storage::volume'
@ -78,8 +67,6 @@ describe 'openstack-block-storage::volume' do
      ::Chef::Recipe.any_instance.stub(:get_password).with('service', 'netapp')
        .and_return 'netapp-pass'
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
        n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.netapp.iscsi.NetAppISCSIDriver'
      end
      chef_run.converge 'openstack-block-storage::volume'
@ -92,8 +79,6 @@ describe 'openstack-block-storage::volume' do
      ::Chef::Recipe.any_instance.stub(:get_password).with('service', 'rbd')
        .and_return 'rbd-pass'
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
        n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.rbd.RBDDriver'
      end
      chef_run.converge 'openstack-block-storage::volume'
@ -104,8 +89,6 @@ describe 'openstack-block-storage::volume' do

    it 'configures storewize private key' do
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
        n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.storwize_svc.StorwizeSVCDriver'
      end
      chef_run.converge 'openstack-block-storage::volume'
@ -116,8 +99,6 @@ describe 'openstack-block-storage::volume' do

    it 'configures storewize with iscsi' do
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
        n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.storwize_svc.StorwizeSVCDriver'
        n.set['openstack']['block-storage']['storwize']['storwize_svc_connection_protocol'] = 'iSCSI'
      end
@ -130,8 +111,6 @@ describe 'openstack-block-storage::volume' do

    it 'configures storewize with fc' do
      chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-        # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-        n.set['cpu']['total'] = 1
        n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.storwize_svc.StorwizeSVCDriver'
        n.set['openstack']['block-storage']['storwize']['storwize_svc_connection_protocol'] = 'FC'
      end
@ -178,8 +157,6 @@ describe 'openstack-block-storage::volume' do
    describe 'create_vg' do
      before do
        @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS do |n|
-          # TODO: Remove work around once https://github.com/customink/fauxhai/pull/77 merges
-          n.set['cpu']['total'] = 1
          n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver'
          n.set['openstack']['block-storage']['volume']['create_volume_group'] = true
        end