Initial kilo updates

Change-Id: I2fb597bf76595cab3da792ab8563993abe6583ec
Partial-Bug: #1426424

.gitignore

@@ -1,9 +1,9 @@
 .bundle/
 berks-cookbooks/
-.kitchen/
+.kitchen
-.vagrant/
+.vagrant
 .coverage/
 *.swp
 Berksfile.lock
-Gemfile.lock
 Vagrantfile
+Gemfile.lock

.rubocop.yml

@@ -1,5 +1,7 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
-  Includes:
+  Include:
     - metadata.rb
     - Gemfile
     - attributes/**
@@ -8,12 +10,15 @@ AllCops:
     - recipes/**
     - resources/**
     - spec/**
+  Exclude:
+    - .cookbooks/**/*
+    - berks-cookbooks/**/*
+    - .bundle/**/*
 
 Encoding:
-    Exclude:
+  Exclude:
-      - metadata.rb
+    - metadata.rb
-      - Gemfile
+    - Gemfile
-      - berks-cookbooks/**
 
 NumericLiterals:
   Enabled: false

.rubocop_todo.yml

@@ -0,0 +1,95 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-02-27 14:02:16 -0600 using RuboCop version 0.29.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/DeprecatedClassMethods:
+  Enabled: false
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Lint/UnusedBlockArgument:
+  Enabled: false
+
+# Offense count: 5
+Metrics/AbcSize:
+  Max: 254
+
+# Offense count: 2
+Metrics/PerceivedComplexity:
+  Max: 19
+
+# Offense count: 5
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/FirstParameterIndentation:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/IndentArray:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentHash:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/LineEndConcatenation:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+# Offense count: 4
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+Style/Next:
+  Enabled: false
+
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SelfAssignment:
+  Enabled: false
+
+# Offense count: 17
+# Cop supports --auto-correct.
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SpaceBeforeComma:
+  Enabled: false
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiteralsInInterpolation:
+  Enabled: false

CHANGELOG.md

@@ -1,92 +0,0 @@
-# CHANGELOG for cookbook-openstack-object-storage
-
-This file is used to list changes made in each version of cookbook-openstack-object-storage.
-
-## 10.1.0
-* Use keystone as default authentication
-
-## 10.0.0
-* Upgrading to Juno
-* Upgrading berkshelf from 2.0.18 to 3.1.5
-* Bump Chef gem to 11.16
-* Add keystone registration support
-* Use Common bind endpoint
-* Add swift.conf template
-* Cleanup service templates
-* Use common specific_endpoint routines (bug 1412919)
-
-## 9.0.3
-* Bugfix run_command exitstatus
-* bump berkshelf to 2.0.18 to allow Supermarket support
-* fix fauxhai version for suse and redhat
-
-## 9.0.2
-* Fix package action to allow updates
-
-## 9.0.1
-* Fix package reference, need keystone client not keystone
-
-## 9.0.0
-* Upgrade to Icehouse
-
-## 8.3.0:
-* Rename all attributes to conform to other cookbooks.
-* bugfix in mount lwrp that broke deployment.
-
-## 8.2.0:
-* Add support for several swift modules:
-  domain_remap, formpost
-
-## 8.1.0
-* Add client recipe
-
-## 8.0.1
-* Bugfix ring_script.rb to handle recent swift-ring-builder
-  output with replication information
-
-## 8.0.0
-### New version
-* Upgrade to upstream Havana release
-
-## 7.1.0:
-* Update apt sources to grizzly to prepare for grizzly
-  and havana branches
-
-## 7.0.11:
-* Add missing swift-container-sync upstart service which is
-  not setup by default in ubuntu 12.04 packages
-
-## 7.0.10:
-* Do not role restrict super_admin_key in proxy config
-* Case correct swauth_version attribute in proxy recipe
-* Treat platform_options["swauth_packages"] as a list
-
-## 7.0.9:
-* Bugfix tempurl role restriction
-
-## 7.0.8:
-* Bugfix allow_override spacing in proxy server template
-
-## 7.0.7:
-* Add flexibility to middleware pipeline
-
-## 7.0.6:
-* Add choice of install python-swauth from git or package
-
-## 7.0.5:
-* Add support for container-sync
-
-## 7.0.4:
-* Allow roles used in searches to be defined by cookbook user
-
-## 7.0.3:
-* Bugfix the swift-ring-builder output scanner
-
-## 7.0.2:
-* Expand statsd support as well as capacity and recon supporting.
-
-## 7.0.1:
-* Support more then 24 disks (/dev/sdaa, /dev/vdab, etc)
-
-## 7.0.0:
-* Initial openstack object storage cookbook

Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
-gem 'chef', '~> 11.16.0'
+gem 'chef', '~> 11.18.6'
 gem 'json', '<= 1.7.7' # chef 11 dependency
-gem 'berkshelf', '~> 3.1.5'
+gem 'berkshelf', '~> 3.2.1'
 gem 'hashie', '~> 2.0'
 gem 'chefspec', '~> 4.0.0'
 gem 'rspec', '~> 3.0.0'
-gem 'foodcritic', '~> 3.0.3'
+gem 'foodcritic', '~> 4.0'
-gem 'rubocop', '~> 0.18.1'
+gem 'rubocop', '~> 0.29.1'

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email  'opscode-chef-openstack@googlegroups.com'
 license           'Apache 2.0'
 description       'Installs and configures Openstack Swift'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '10.1.0'
+version           '11.0.0'
 
 recipe            'openstack-object-storage::account-server', 'Installs the swift account server'
 recipe            'openstack-object-storage::client', 'Install the swift client'
@@ -20,5 +20,5 @@ end
 
 depends 'memcached', '>= 1.7.2'
 depends 'statsd', '>= 0.1.5'
-depends 'openstack-common', '>= 10.2.0'
+depends 'openstack-common', '>= 11.0.0'
-depends 'openstack-identity', '>= 10.0.0'
+depends 'openstack-identity', '>= 11.0.0'

recipes/ring-repo.rb

@@ -97,7 +97,7 @@ directory '/etc/swift/ring-workspace' do
   action :create
 end
 
-execute 'checkout-rings' do
+execute 'checkout-rings' do # ~FC040
   cwd '/etc/swift/ring-workspace'
   command "git clone file://#{platform_options["git_dir"]}/rings"
   user node['openstack']['object-storage']['user']

spec/identity_registration_spec.rb

@@ -31,9 +31,9 @@ describe 'openstack-object-storage::identity_registration' do
         bootstrap_token: 'bootstrap-token',
         service_type: 'object-store',
         endpoint_region: 'RegionOne',
-        endpoint_adminurl: 'http://127.0.0.1:8080/v1/',
+        endpoint_adminurl: 'http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s',
-        endpoint_internalurl: 'http://127.0.0.1:8080/v1/',
+        endpoint_internalurl: 'http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s',
-        endpoint_publicurl: 'http://127.0.0.1:8080/v1/',
+        endpoint_publicurl: 'http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s',
         action: [:create_endpoint]
       )
     end
@@ -138,9 +138,9 @@ describe 'openstack-object-storage::identity_registration' do
         bootstrap_token: 'bootstrap-token',
         service_type: 'object-store',
         endpoint_region: 'swiftRegion',
-        endpoint_adminurl: 'http://127.0.0.1:8080/v1/',
+        endpoint_adminurl: 'http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s',
-        endpoint_internalurl: 'http://127.0.0.1:8080/v1/',
+        endpoint_internalurl: 'http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s',
-        endpoint_publicurl: 'http://127.0.0.1:8080/v1/',
+        endpoint_publicurl: 'http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s',
         action: [:create_endpoint]
       )
     end