Fixing up repo for stable/icehouse branch

* Adding defaultbranch to .gitreview
* Removing Berksfile.lock from .gitignore
* Adding updated Berksfile.lock file
* Updating Gems
  * chef (11.12.0)
  * chefspec (4.0.0)
  * rspec (3.0.0)
* Cleanup specs for 4.x

Change-Id: I4c2d4ee293c2430609c4fdcf6dc374992c27cb95
Partial-Bug: 1349154

.gitignore

@@ -4,5 +4,4 @@
 .vagrant/
 .coverage/
 *.swp
-Berksfile.lock
 Vagrantfile

.gitreview

@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=stackforge/cookbook-openstack-block-storage.git
+defaultbranch=stable/icehouse

Berksfile

@@ -1,8 +1,11 @@
 metadata
 
 cookbook "openstack-image",
-  git: "git://github.com/stackforge/cookbook-openstack-image.git"
+  git: "git://github.com/stackforge/cookbook-openstack-image.git",
+  branch: 'stable/icehouse'
 cookbook "openstack-identity",
-  git: "git://github.com/stackforge/cookbook-openstack-identity.git"
+  git: "git://github.com/stackforge/cookbook-openstack-identity.git",
+  branch: 'stable/icehouse'
 cookbook "openstack-common",
-  git: "git://github.com/stackforge/cookbook-openstack-common.git"
+  git: "git://github.com/stackforge/cookbook-openstack-common.git",
+  branch: 'stable/icehouse'

Berksfile.lock

@@ -0,0 +1,64 @@
+{
+  "sources": {
+    "openstack-block-storage": {
+      "path": "."
+    },
+    "openstack-image": {
+      "locked_version": "9.2.0",
+      "git": "git://github.com/stackforge/cookbook-openstack-image.git",
+      "ref": "3145080d30db12c36526cd09a72047287ba641cd"
+    },
+    "openstack-identity": {
+      "locked_version": "9.3.1",
+      "git": "git://github.com/stackforge/cookbook-openstack-identity.git",
+      "ref": "3a99613b89fb28d21def8cbeaa63e40da32768f5"
+    },
+    "openstack-common": {
+      "locked_version": "9.7.0",
+      "git": "git://github.com/stackforge/cookbook-openstack-common.git",
+      "ref": "b8633843349809e2675744f211c89bf06d249b7e"
+    },
+    "apt": {
+      "locked_version": "2.3.8"
+    },
+    "selinux": {
+      "locked_version": "0.8.0"
+    },
+    "python": {
+      "locked_version": "1.4.6"
+    },
+    "build-essential": {
+      "locked_version": "1.4.4"
+    },
+    "yum-epel": {
+      "locked_version": "0.3.6"
+    },
+    "yum": {
+      "locked_version": "3.2.0"
+    },
+    "database": {
+      "locked_version": "2.2.0"
+    },
+    "mysql": {
+      "locked_version": "5.3.6"
+    },
+    "yum-mysql-community": {
+      "locked_version": "0.1.10"
+    },
+    "postgresql": {
+      "locked_version": "3.3.4"
+    },
+    "openssl": {
+      "locked_version": "1.1.0"
+    },
+    "aws": {
+      "locked_version": "2.1.1"
+    },
+    "xfs": {
+      "locked_version": "1.1.0"
+    },
+    "mysql-chef_gem": {
+      "locked_version": "0.0.2"
+    }
+  }
+}

Gemfile.lock

@@ -0,0 +1,268 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.19)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    addressable (2.3.6)
+    akami (1.2.2)
+      gyoku (>= 0.4.0)
+      nokogiri
+    ast (2.0.0)
+    berkshelf (2.0.18)
+      activesupport (~> 3.2.0)
+      addressable (~> 2.3.4)
+      buff-shell_out (~> 0.1)
+      chozo (>= 0.6.1)
+      faraday (~> 0.8.5)
+      hashie (~> 2.0)
+      minitar (~> 0.5.4)
+      rbzip2 (~> 0.2.0)
+      retryable (~> 1.3.3)
+      ridley (~> 1.7.0)
+      solve (~> 0.8.2)
+      thor (~> 0.18.0)
+    buff-config (0.4.0)
+      buff-extensions (~> 0.3)
+      varia_model (~> 0.1)
+    buff-extensions (0.5.0)
+    buff-ignore (1.1.1)
+    buff-platform (0.1.0)
+    buff-ruby_engine (0.1.0)
+    buff-shell_out (0.1.1)
+      buff-ruby_engine (~> 0.1.0)
+    builder (3.2.2)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    chef (11.12.8)
+      chef-zero (>= 2.0.2, < 2.1)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      highline (~> 1.6, >= 1.6.9)
+      json (>= 1.4.4, <= 1.8.1)
+      mime-types (~> 1.16)
+      mixlib-authentication (~> 1.3)
+      mixlib-cli (~> 1.4)
+      mixlib-config (~> 2.0)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 1.4)
+      net-ssh (~> 2.6)
+      net-ssh-multi (~> 1.1)
+      ohai (~> 7.0.4)
+      pry (~> 0.9)
+      rest-client (>= 1.0.4, < 1.7.0)
+      yajl-ruby (~> 1.1)
+    chef-zero (2.0.2)
+      hashie (~> 2.0)
+      json
+      mixlib-log (~> 1.3)
+      rack
+    chefspec (4.0.1)
+      chef (~> 11.12)
+      fauxhai (~> 2.0)
+      rspec (~> 3.0)
+    chozo (0.6.1)
+      activesupport (>= 3.2.0)
+      hashie (>= 2.0.2)
+      multi_json (>= 1.3.0)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    fauxhai (2.2.0)
+      net-ssh
+      ohai
+    ffi (1.9.3)
+    foodcritic (3.0.3)
+      erubis
+      gherkin (~> 2.11.7)
+      nokogiri (~> 1.5.4)
+      rake
+      treetop (~> 1.4.10)
+      yajl-ruby (~> 1.1.0)
+    gherkin (2.11.8)
+      multi_json (~> 1.3)
+    gssapi (1.0.3)
+      ffi (>= 1.0.1)
+    gyoku (1.1.1)
+      builder (>= 2.1.2)
+    hashie (2.1.2)
+    highline (1.6.21)
+    httpclient (2.4.0)
+    httpi (0.9.7)
+      rack
+    i18n (0.6.11)
+    ipaddress (0.8.0)
+    json (1.7.7)
+    little-plugger (1.1.3)
+    logging (1.8.2)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.8.4)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitar (0.5.4)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-cli (1.5.0)
+    mixlib-config (2.1.0)
+    mixlib-log (1.6.0)
+    mixlib-shellout (1.4.0)
+    multi_json (1.10.1)
+    multipart-post (1.2.0)
+    net-http-persistent (2.9.4)
+    net-ssh (2.9.1)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.2.0)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    nio4r (1.0.0)
+    nokogiri (1.5.11)
+    nori (1.1.5)
+    ohai (7.0.4)
+      ipaddress
+      mime-types (~> 1.16)
+      mixlib-cli
+      mixlib-config (~> 2.0)
+      mixlib-log
+      mixlib-shellout (~> 1.2)
+      systemu (~> 2.5.2)
+      yajl-ruby
+    parser (2.1.9)
+      ast (>= 1.1, < 3.0)
+      slop (~> 3.4, >= 3.4.5)
+    polyglot (0.3.5)
+    powerpack (0.0.9)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rainbow (2.0.0)
+    rake (10.3.2)
+    rbzip2 (0.2.0)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    rest-client (1.6.8)
+      mime-types (~> 1.16)
+      rdoc (>= 2.4.2)
+    retryable (1.3.5)
+    ridley (1.7.1)
+      addressable
+      buff-config (~> 0.2)
+      buff-extensions (~> 0.3)
+      buff-ignore (~> 1.1)
+      buff-shell_out (~> 0.1)
+      celluloid (~> 0.15)
+      celluloid-io (~> 0.15)
+      erubis
+      faraday (>= 0.8.4)
+      hashie (>= 2.0.2)
+      json (>= 1.7.7)
+      mixlib-authentication (>= 1.3.0)
+      net-http-persistent (>= 2.8)
+      net-ssh
+      retryable
+      solve (>= 0.4.4)
+      varia_model (~> 0.1)
+      winrm (~> 1.1.0)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    rubocop (0.18.1)
+      json (>= 1.7.7, < 2)
+      parser (~> 2.1.3)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.99.1, < 3.0)
+    rubyntlm (0.1.1)
+    savon (0.9.5)
+      akami (~> 1.0)
+      builder (>= 2.1.2)
+      gyoku (>= 0.4.0)
+      httpi (~> 0.9)
+      nokogiri (>= 1.4.0)
+      nori (~> 1.0)
+      wasabi (~> 1.0)
+    slop (3.6.0)
+    solve (0.8.2)
+    strainer (3.4.0)
+      berkshelf (>= 2.0, < 4.0)
+      buff-platform (~> 0.1)
+    systemu (2.5.2)
+    thor (0.18.1)
+    timers (1.1.0)
+    treetop (1.4.15)
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+    uuidtools (2.1.4)
+    varia_model (0.3.2)
+      buff-extensions (~> 0.2)
+      hashie (>= 2.0.2)
+    wasabi (1.0.0)
+      nokogiri (>= 1.4.0)
+    winrm (1.1.3)
+      gssapi (~> 1.0.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (~> 1.6, >= 1.6.1)
+      nokogiri (~> 1.5)
+      rubyntlm (~> 0.1.1)
+      savon (= 0.9.5)
+      uuidtools (~> 2.1.2)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  berkshelf (~> 2.0.18)
+  chef (~> 11.12)
+  chefspec (~> 4.0.0)
+  fauxhai (>= 2.1.0)
+  foodcritic (~> 3.0.3)
+  hashie (~> 2.0)
+  json (<= 1.7.7)
+  rspec (~> 3.0.0)
+  rubocop (~> 0.18.1)
+  strainer

spec/spec_helper.rb

@@ -28,45 +28,45 @@ UBUNTU_OPTS = {
 
 shared_context 'block-storage-stubs' do
   before do
-    Chef::Recipe.any_instance.stub(:rabbit_servers)
+    allow_any_instance_of(Chef::Recipe).to receive(:rabbit_servers)
       .and_return('1.1.1.1:5672,2.2.2.2:5672')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('service', anything)
       .and_return('')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('db', anything)
       .and_return('')
-    Chef::Recipe.any_instance.stub(:get_secret)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
       .with('openstack_identity_bootstrap_token')
       .and_return('bootstrap-token')
-    Chef::Recipe.any_instance.stub(:get_secret)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
       .with('rbd_secret_uuid')
       .and_return('b0ff3bba-e07b-49b1-beed-09a45552b1ad')
-    Chef::Recipe.any_instance.stub(:get_secret)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
       .with('openstack_vmware_secret_name')
       .and_return 'vmware_secret_name'
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'guest')
       .and_return('mq-pass')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'solidfire_admin')
       .and_return('solidfire_testpass')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('service', 'netapp')
       .and_return 'netapp-pass'
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('service', 'openstack-block-storage')
       .and_return('cinder-pass')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('service', 'openstack_image_cephx_key')
       .and_return('cephx-key')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'admin')
       .and_return('emc_test_pass')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'ibmnas_admin')
       .and_return('test_pass')
-    Chef::Application.stub(:fatal!)
+    allow(Chef::Application).to receive(:fatal!)
   end
 end