Removed work-around for bug 1169730

Updated cinder packages have made it into precise
https://bugs.launchpad.net/ubuntu/+source/cinder/+bug/1169730

no longer need to manually update stevedore module

Change-Id: I1690b6f9bbb78233a0750c56a99197760a66649b

Berksfile.lock

@@ -2,8 +2,8 @@
   "sha": "ba71763fac936d414bd4a63f004357f86f6e1bfb",
   "sources": {
     "openstack-block-storage": {
-      "locked_version": "7.0.4",
-      "constraint": "= 7.0.4",
+      "locked_version": "7.0.5",
+      "constraint": "= 7.0.5",
       "path": "."
     },
     "openstack-image": {

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email "cookbooks@lists.tfoundry.com"
 license          "Apache 2.0"
 description      "The OpenStack Advanced Volume Management service Cinder."
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "7.0.4"
+version          "7.0.5"
 
 recipe           "openstack-block-storage::common", "Defines the common pieces of repeated code from the other recipes"
 recipe           "openstack-block-storage::api", "Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone"

recipes/scheduler.rb

@@ -32,14 +32,6 @@ 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)
-  include_recipe "python"
-  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_spec.rb

@@ -23,18 +23,6 @@ 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