Setting up repo for master Juno Branch

* Update metadata version
* Removing Strainer file
* Adding Gemfile.lock to .gitignore
* Updating Gems
  * chef (11.12.0)
  * chefspec (4.0.0)
  * rspec (3.0.0)

Change-Id: I054da626e6aa49f70e1c00e49454aa53f541b813
Partial-Bug: 1349865

.gitignore

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

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 This file is used to list changes made in each version of the cookbook-openstack-database.
 
+## 10.0.0
+* Upgrading to Juno
+
 ## 9.0.1
 * Allow setting passwords via attributes by using the get_password method
 * bump berkshelf to 2.0.18 to allow Supermarket support

Gemfile

@@ -1,12 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'chef', '~> 11.8'
+gem 'chef', '~> 11.12.0'
 gem 'json', '<= 1.7.7' # chef 11 dependency
 gem 'berkshelf', '~> 2.0.18'
 gem 'hashie', '~> 2.0'
-gem 'chefspec', '~> 3.4.0'
-gem 'rspec', '~> 2.14.1'
+gem 'chefspec', '~> 4.0.0'
+gem 'rspec', '~> 3.0.0'
 gem 'fauxhai', '>= 2.1.0'
 gem 'foodcritic', '~> 4.0.0'
 gem 'rubocop', '~> 0.18.1'
-gem 'strainer'

Strainerfile

@@ -1,5 +0,0 @@
-# Strainerfile
-rubocop: rubocop $SANDBOX/$COOKBOOK
-knife test: knife cookbook test $COOKBOOK
-foodcritic: foodcritic -f any -t ~FC003 -t ~FC023 $SANDBOX/$COOKBOOK
-chefspec: rspec --format documentation $SANDBOX/$COOKBOOK/spec

metadata.rb

@@ -4,13 +4,13 @@ maintainer_email 'crowbar@dell.com'
 license          'Apache 2.0'
 description      'Installs/Configures trove'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '9.0.1'
+version          '10.0.0'
 recipe           'openstack-database::identity_registration', 'Registers Trove endpoints and service with Keystone'
 recipe           'openstack-database::api', 'Installs API service'
 recipe           'openstack-database::conductor', 'Installs Conductor service'
 recipe           'openstack-database::taskmanager', 'Installs TaskManager service'
 
-depends          'openstack-common', '~> 9.6'
-depends          'openstack-identity', '~> 9.0'
+depends          'openstack-common', '~> 10.0'
+depends          'openstack-identity', '~> 10.0'
 
 supports 'suse'

spec/spec_helper.rb

@@ -23,16 +23,16 @@ UBUNTU_OPTS = {
 
 shared_context 'database-stubs' do
   before do
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('token', 'openstack_identity_bootstrap_token')
       .and_return('bootstrap-token')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'guest').and_return('rabbit-pass')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('db', 'database').and_return('db-pass')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('service', 'database').and_return('service-pass')
-    Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'database').and_return('user-pass')
   end
 end