Upgrading 'stevedore' module for bug 1169730

https://bugs.launchpad.net/ubuntu/+source/cinder/+bug/1169730
Running into this on Ubuntu 12.04

Simply upgrading to a newer 'stevedore' resolved the issues with
the cinder scheduler.

Change-Id: I162c6714d56650fb891ec772bf71126856c82d8c

Berksfile.lock

@@ -60,6 +60,9 @@
     },
     "xfs": {
       "locked_version": "1.1.0"
+    },
+    "python": {
+      "locked_version": "1.3.4"
     }
   }
 }

Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gem "chef", "~> 11.4.4"
 gem "json", "<= 1.7.7" # chef 11 dependency
 gem "berkshelf", "~> 2.0.3"
-gem "chefspec", "~> 1.3.0"
+gem "chefspec", "~> 2.0.0"
 gem "foodcritic"
 gem "strainer"
 gem "tailor"

metadata.rb

@@ -21,3 +21,4 @@ depends          "openstack-common", "~> 0.4.0"
 depends          "openstack-identity", "~> 7.0.0"
 depends          "openstack-image", "~> 7.0.0"
 depends          "selinux"
+depends          "python"

recipes/scheduler.rb

@@ -32,6 +32,13 @@ platform_options["cinder_scheduler_packages"].each do |pkg|
   end
 end
 
+# FIXME this can be removed if/when 1:2013.1-0ubuntu2 makes it into precise
+if platform?("ubuntu") && (node["platform_version"].to_f == 12.04)
+  python_pip "stevedore" do
+    action :upgrade
+  end
+end
+
 db_type = node['openstack']['db']['volume']['db_type']
 platform_options["#{db_type}_python_packages"].each do |pkg|
   package pkg do

spec/scheduler-opensuse_spec.rb

@@ -12,6 +12,13 @@ describe "openstack-block-storage::scheduler" do
       expect(@chef_run).to upgrade_package "openstack-cinder-scheduler"
     end
 
+    it "does not upgrade stevedore" do
+      chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
+      chef_run.converge "openstack-block-storage::scheduler"
+
+      expect(chef_run).not_to upgrade_python_pip "stevedore"
+    end
+
     it "installs mysql python packages by default" do
       expect(@chef_run).to upgrade_package "python-mysql"
     end

spec/scheduler-redhat_spec.rb

@@ -8,6 +8,17 @@ describe "openstack-block-storage::scheduler" do
       @chef_run.converge "openstack-block-storage::scheduler"
     end
 
+    it "installs cinder api packages" do
+      expect(@chef_run).to upgrade_package "openstack-cinder"
+    end
+
+    it "does not upgrade stevedore" do
+      chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS
+      chef_run.converge "openstack-block-storage::scheduler"
+
+      expect(chef_run).not_to upgrade_python_pip "stevedore"
+    end
+
     it "installs mysql python packages by default" do
       expect(@chef_run).to upgrade_package "MySQL-python"
     end

spec/scheduler_spec.rb

@@ -23,6 +23,18 @@ describe "openstack-block-storage::scheduler" do
       expect(@chef_run).to upgrade_package "cinder-scheduler"
     end
 
+    it "upgrades stevedore" do
+      expect(@chef_run).to upgrade_python_pip "stevedore"
+    end
+
+    it "does not upgrade stevedore" do
+      opts = ::UBUNTU_OPTS.merge(:version => "10.04")
+      chef_run = ::ChefSpec::ChefRunner.new opts
+      chef_run.converge "openstack-block-storage::scheduler"
+
+      expect(chef_run).not_to upgrade_python_pip "stevedore"
+    end
+
     it "installs mysql python packages by default" do
       expect(@chef_run).to upgrade_package "python-mysqldb"
     end

spec/spec_helper.rb

@@ -2,8 +2,8 @@ require "chefspec"
 
 ::LOG_LEVEL = :fatal
 ::OPENSUSE_OPTS = {
-  :platform  => "opensuse",
-  :version   => "12.3",
+  :platform => "opensuse",
+  :version => "12.3",
   :log_level => ::LOG_LEVEL
 }
 ::REDHAT_OPTS = {