Initial kilo updates

Change-Id: Iae9c37c7e36a9caceaba7d047d2288d1c323fe3f
Partial-Bug: #1426424

.gitignore

@@ -5,5 +5,5 @@ berks-cookbooks/
 .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:
     - metadata.rb
     - Gemfile
-    - berks-cookbooks/**
 
 NumericLiterals:
   Enabled: false

.rubocop_todo.yml

@@ -0,0 +1,16 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-02-27 15:09:00 -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: 4
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 12
+# Cop supports --auto-correct.
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: false

CHANGELOG.md

@@ -1,26 +0,0 @@
-# CHANGELOG for cookbook-openstack-database
-
-This file is used to list changes made in each version of the cookbook-openstack-database.
-
-## 10.0.0
-* Upgrading to Juno
-* Upgrading berkshelf from 2.0.18 to 3.1.5
-* Bump Chef gem to 11.16
-* update cinder api url to default of v2
-* Run trove-manage as user, not as root
-* Skip trove-manage run on SUSE, it is run by the init scripts already
-* Use common specific_endpoint routines (bug 1412919)
-* Use identity-internal endpoint (bug 1412919)
-
-## 9.0.1
-* Allow setting passwords via attributes by using the get_password method
-* bump berkshelf to 2.0.18 to allow Supermarket support
-* fix fauxhai version for suse
-
-## 9.0.0
-* Initial release of cookbook-openstack-database for Icehouse
-
-- - -
-Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
-
-The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.

Gemfile

@@ -1,11 +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 'fauxhai', '>= 2.1.0'
-gem 'foodcritic', '~> 4.0.0'
-gem 'rubocop', '~> 0.18.1'
+gem 'foodcritic', '~> 4.0'
+gem 'rubocop', '~> 0.29.1'

metadata.rb

@@ -4,13 +4,13 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com'
 license          'Apache 2.0'
 description      'Installs/Configures trove'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '10.0.0'
+version          '11.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', '>= 10.2.0'
-depends          'openstack-identity', '>= 10.0.0'
+depends          'openstack-common', '>= 11.0.0'
+depends          'openstack-identity', '>= 11.0.0'
 
 supports 'suse'

spec/api-suse_spec.rb

@@ -59,7 +59,7 @@ describe 'openstack-database::api' do
        %r{^trove_auth_url = http://127.0.0.1:5000/v2.0$},
        %r{^nova_compute_url = http://127.0.0.1:8774/v2/$},
        %r{^cinder_url = http://127.0.0.1:8776/v2/$},
-       %r{^swift_url = http://127.0.0.1:8080/v1/$},
+       %r{^swift_url = http://127.0.0.1:8080/v1/AUTH_%\(tenant_id\)s$},
        %r{^dns_auth_url = http://127.0.0.1:5000/v2.0$},
        %r{^log_dir = /var/log/trove$},
        /^trove_volume_support = true$/

spec/taskmanager-suse_spec.rb

@@ -41,7 +41,7 @@ describe 'openstack-database::taskmanager' do
        %r{^trove_auth_url = http://127.0.0.1:5000/v2.0$},
        %r{^nova_compute_url = http://127.0.0.1:8774/v2/$},
        %r{^cinder_url = http://127.0.0.1:8776/v2/$},
-       %r{^swift_url = http://127.0.0.1:8080/v1/$},
+       %r{^swift_url = http://127.0.0.1:8080/v1/AUTH_%\(tenant_id\)s$},
        %r{^dns_auth_url = http://127.0.0.1:5000/v2.0$},
        %r{^log_dir = /var/log/trove},
        /^trove_volume_support = true$/