Initial kilo updates

Change-Id: I7d4cace5656a9a2854a6fd619bbe5e400dc2fdff
Partial-Bug: #1426424

.gitignore

@@ -1,9 +1,9 @@
 .bundle/
 berks-cookbooks/
-.kitchen/
-.vagrant/
+.kitchen
+.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:
     - metadata.rb
     - Gemfile
-    - berks-cookbooks/**
 
 NumericLiterals:
   Enabled: false

.rubocop_todo.yml

@@ -0,0 +1,50 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-02-27 14:10:04 -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: 2
+# Cop supports --auto-correct.
+Lint/DeprecatedClassMethods:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/StringConversionInInterpolation:
+  Enabled: false
+
+# Offense count: 3
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/FirstParameterIndentation:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 10
+# Cop supports --auto-correct.
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiteralsInInterpolation:
+  Enabled: false

CHANGELOG.md

@@ -1,89 +0,0 @@
-openstack-telemetry Cookbook CHANGELG
-==============================
-This file is used to list changes made in each version of the openstack-metering cookbook.
-
-## 10.0.1
-* Support vmware hypervisor
-* Sync conf files with Juno
-* Set os_region_name properly
-* Upgrading berkshelf from 2.0.18 to 3.1.5
-* Allow cafile, os_cacert, insecure, memcached_servers, memcache_security_strategy, memcache_secret_key and has
-h_algorithms to be configurable
-* Remove old nosql check for running dbsync
-* Bump Chef gem to 11.16
-* Allow rabbit_hosts and rabbit_ha_queues to be configurable
-* Allow dbsync_timeout to be configurable
-* Use common specific_endpoint routines (bug 1412919)
-* Use identity-internal endpoint (bug 1412919)
-
-## 10.0.0
-* Upgrading to Juno
-
-## 9.3.0
-* python_packages database client attributes have been migrated to
-the -common cookbook
-* fix fauxhai version for suse and redhat
-
-## 9.2.0
-* Change the action of all package resources from default to :upgrade
-* bump berkshelf to 2.0.18 to allow Supermarket support
-
-## 9.1.2
-* Add attribute sample_source
-
-## 9.1.1
-* Remove policy.json file, it's just a dup of what's in the package
-
-## 9.1.0
-### Blue print
-# Add recipes for the ceilometer alarm services (alarm-services)
-# Add recipes for the ceilometer agent notification service (alarm-services)
-
-## 9.0.0
-* Upgrade to Icehouse
-
-## 8.4.0
-### Blue print
-# Use the library method auth_uri_transform
-
-## 8.3.0
-* Rename openstack-metering to openstack-telemetry
-
-## 8.2.0
-### Blueprint
-* Add NoSQL support for metering.
-
-## 8.1.0
-* Add client recipe
-
-## 8.0.0
-### New version
-* Upgrade to upstream Havana release
-
-## 7.1.1
-### Bug
-* Relax the dependency on openstack-identity to the 7.x series
-
-## 7.1.0
-### Blueprint
-* Added qpid support to ceilometer. default is rabbitmq
-
-## 7.0.5
-### Bug
-* Corrected inconsistent keystone middleware auth_token for ceilometer.conf.erb.
-
-## 7.0.4
-### Bug
-* Ubuntu package dependency for python-mysqldb missing for ceilometer-collector
-
-## 7.0.3
-### Bug
-* Ubuntu cloud archive dpkg failing to install init script properly for agent-compute
-
-## 7.0.2
-### Improvement
-* Add optional host to the ceilometer.conf
-
-## 7.0.1
-### Bug
-* Fix naming inconsistency for db password databag. This makes the metering cookbook consistent with all the others.

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

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com'
 license          'Apache 2.0'
 description      'The OpenStack Metering service Ceilometer.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '10.0.1'
+version          '11.0.0'
 
 recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
 recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'
@@ -21,6 +21,6 @@ recipe 'openstack-telemetry::identity_registration', 'Registers the endpoints, t
   supports os
 end
 
-depends 'openstack-common', '>= 10.2.0'
-depends 'openstack-identity', '>= 10.0.0'
-depends 'openstack-compute', '>= 10.0.0'
+depends 'openstack-common', '>= 11.0.0'
+depends 'openstack-identity', '>= 11.0.0'
+depends 'openstack-compute', '>= 11.0.0'