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: I8aefcb9bba56f7413f07209c0f658dc96da9f375
Partial-Bug: 1349865

.gitignore

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

CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG for cookbook-openstack-object-storage
 
 This file is used to list changes made in each version of cookbook-openstack-object-storage.
+
+## 10.0.0
+* Upgrading to Juno
+
 ## 9.0.3
 * Bugfix run_command exitstatus
 * bump berkshelf to 2.0.18 to allow Supermarket support

Gemfile

@@ -1,11 +1,10 @@
 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 'foodcritic', '~> 3.0.3'
-gem 'strainer'
 gem 'rubocop', '~> 0.18.1'

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

attributes/default.rb

@@ -13,7 +13,7 @@ default['openstack']['object-storage']['git_builder_ip'] = '127.0.0.1'
 
 # the release only has any effect on ubuntu, and must be
 # a valid release on http://ubuntu-cloud.archive.canonical.com/ubuntu
-default['openstack']['object-storage']['release'] = 'icehouse'
+default['openstack']['object-storage']['release'] = 'juno'
 
 # we support an optional secret databag where we will retrieve the
 # following attributes overriding any default attributes here

metadata.rb

@@ -3,7 +3,7 @@ maintainer        'ATT, Inc.'
 license           'Apache 2.0'
 description       'Installs and configures Openstack Swift'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '9.0.3'
+version           '10.0.0'
 
 recipe            'openstack-object-storage::account-server', 'Installs the swift account server'
 recipe            'openstack-object-storage::client', 'Install the switch client'
@@ -19,4 +19,4 @@ end
 depends 'memcached', '>= 1.7.2'
 depends 'statsd', '>= 0.1.5'
 depends 'apt', '>= 2.3.8'
-depends 'openstack-common', '~> 9.0'
+depends 'openstack-common', '~> 10.0'

spec/common_spec.rb

@@ -70,7 +70,7 @@ describe 'openstack-object-storage::common' do
       end
 
       it 'template contents' do
-        pending 'TODO: implement'
+        skip 'TODO: implement'
       end
     end
 
@@ -86,7 +86,7 @@ describe 'openstack-object-storage::common' do
       end
 
       it 'template contents' do
-        pending 'TODO: implement'
+        skip 'TODO: implement'
       end
     end
   end

spec/management_spec.rb

@@ -27,7 +27,7 @@ describe 'openstack-object-storage::management-server' do
       end
 
       it 'template contents' do
-        pending 'TODO: implement'
+        skip 'TODO: implement'
       end
     end
 

spec/object_spec.rb

@@ -32,7 +32,7 @@ describe 'openstack-object-storage::object-server' do
 
     describe '/var/spool/crontab/root' do
       it 'template contents' do
-        pending 'TODO: check for recon script'
+        skip 'TODO: check for recon script'
       end
     end
 

spec/ring-repo_spec.rb

@@ -26,7 +26,7 @@ describe 'openstack-object-storage::ring-repo' do
     #   the file contents.
     describe '/etc/swift/ring-workspace/generate-rings.sh' do
       it 'gets installed' do
-        pending 'TODO: determine some way to ensure this LWRP script gets created'
+        skip 'TODO: determine some way to ensure this LWRP script gets created'
       end
     end
   end

spec/rsync_spec.rb

@@ -31,7 +31,7 @@ describe 'openstack-object-storage::rsync' do
       end
 
       it 'template contents' do
-        pending 'TODO: implement'
+        skip 'TODO: implement'
       end
     end
   end

spec/spec_helper.rb

@@ -68,8 +68,8 @@ shared_context 'swift-stubs' do
         'service_pass' => 'foobar'
       }
     }
-    Chef::Recipe.any_instance.stub(:search).with(:node, 'chef_environment:_default AND roles:swift-setup').and_return([n])
-    Chef::Application.stub(:fatal!)
+    allow_any_instance_of(Chef::Recipe).to receive(:search).with(:node, 'chef_environment:_default AND roles:swift-setup').and_return([n])
+    allow(Chef::Application).to receive(:fatal!)
   end
 end
 

spec/storage-common_spec.rb

@@ -35,7 +35,7 @@ describe 'openstack-object-storage::storage-common' do
       end
 
       it 'template contents' do
-        pending 'TODO: implement'
+        skip 'TODO: implement'
       end
     end
   end