Initial kilo updates

Change-Id: Ifbe6bec1726790ec07ba8ca8a4d4f6e6908dc70f
Partial-Bug: #1426424
This commit is contained in:
Mark Vanderwiel
2015-02-27 13:37:04 -06:00
parent 12977c0093
commit 649d8fe587
7 changed files with 59 additions and 134 deletions

2
.gitignore vendored
View File

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

View File

@@ -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

44
.rubocop_todo.yml Normal file
View File

@@ -0,0 +1,44 @@
# This configuration was generated by `rubocop --auto-gen-config`
# on 2015-02-27 13:36:11 -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: 3
# Cop supports --auto-correct.
Lint/StringConversionInInterpolation:
Enabled: false
# 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: 3
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/FormatString:
Enabled: false
# Offense count: 2
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/MultilineOperationIndentation:
Enabled: false
# Offense count: 10
# Cop supports --auto-correct.
# Configuration parameters: PreferredDelimiters.
Style/PercentLiteralDelimiters:
Enabled: false
# Offense count: 26
# Cop supports --auto-correct.
Style/SingleSpaceBeforeFirstArg:
Enabled: false

View File

@@ -1,114 +0,0 @@
# CHANGELOG for cookbook-openstack-image
This file is used to list changes made in each version of cookbook-openstack-image.
## 10.1.0
* Add dependency on upstream ceph cookbook for better key management
### Blue print
* Make container_formats and disk_formats configurable
* Set the owner/group of openstack image cache directory to glance/glance.
* Use common specific_endpoint routines (bug 1412919)
## 10.0.0
* Upgrading to Juno
* filesystem_store_metadata_file in glance-api.conf configurable with node attribute
* Enable rabbit_use_ssl be configurable
* Upgrading berkshelf from 2.0.18 to 3.1.5
* Sync conf files with Juno
* Enable authtoken configurations - including cafile, insecure, memcached_servers, memcache_security_strategy, memcache_secret_key and hash_algorithms
* Fix metadata version constraint for common
* Update conf files with scerect information from mode 644 to 640
* Add attribute for glance-registry workers
* Fix glance registry owner/group to glance
* Fix image upload for tar kernel/initrd images
* Bump Chef gem to 11.16
* Add oslo.messaging attributes for api and registry conf files
* Add support for upload of vhd vmdk vdi iso raw disk formats
* Allow some attributes for cinder storage backend to be configurable
* Add support for multiple rabbit mq hosts
* Make auth_version to be v2.0 in configuration file
* Set the default cinder version to be v2
* stores in glance-api.conf configurable with node attribute
## 9.2.0
* python_packages database client attributes have been migrated to the -common cookbook
* bump berkshelf to 2.0.18 to allow Supermarket support
* fix fauxhai version for suse and redhat
* notifier_strategy in glance-api.conf configurable with node attribute - including attribute-switch for metering
## 9.1.2
### Bug
* Fix image upload to provide error message when type not supported
## 9.1.1
### Bug
* Fix data bag item id issue in recipes/api.rb
## 9.1.0
### Blue print
* Get VMware vCenter password from databag
## 9.0.3
* Fix package reference, need keystone client not keystone
## 9.0.2
* Fix package action to allow updates
## 9.0.1
* Remove policy template
## 9.0.0
* Upgrade to Icehouse
## 8.2.1
### Bug
* Fix the DB2 ODBC driver issue
## 8.2.0
### Blue print
* Use the common auth uri tranformation function and add the auth version to configuration files.
## 8.1.0
* Add client recipe
## 8.0.0
* Updating to Havana Release
## 7.1.1
### Bug
* Relax the dependency on openstack-identity to the 7.x series
## 7.1.0
### Blue print
* Add qpid support to glance. Default is rabbit
## 7.0.6
### Bug
* Do not delete the sqlite database layed down by the glance packages when node.openstack.db.image.db_type is set to sqlite.
## 7.0.5:
* Allow swift packages to be optionally installed.
## 7.0.4:
### Bug
* Fixed <db_type>_python_packages issue when setting node.openstack.db.image.db_type to sqlite.
* Added `converges when configured to use sqlite db backend` test case for this scenario.
## 7.0.3:
* Use the image-api endpoint within the image_image LWRP to enable non-localhost
uploads.
* Use non-deprecated parameters within the image_image LWRP use of the glance CLI.
## 7.0.2:
* Added cron redirection attribute.
## 7.0.1:
* Corrected inconsistent keystone middleware auth_token for glance-registry.conf.erb.
## 7.0.0:
* Initial release of cookbook-openstack-image.
- - -
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.

View File

@@ -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'

View File

@@ -4,7 +4,7 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com'
license 'Apache 2.0'
description 'Installs and configures the Glance Image Registry and Delivery Service'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '10.1.0'
version '11.0.0'
recipe 'openstack-image::api', 'Installs packages required for a glance api server'
recipe 'openstack-image::client', 'Install packages required for glance client'
recipe 'openstack-image::registry', 'Installs packages required for a glance registry server'
@@ -15,6 +15,6 @@ recipe 'openstack-image::image_upload', 'Upload image using glance im
supports os
end
depends 'openstack-common', '>= 10.2.0'
depends 'openstack-identity', '>= 10.0.0'
depends 'openstack-common', '>= 11.0.0'
depends 'openstack-identity', '>= 11.0.0'
depends 'ceph', '~> 0.8.0'

View File

@@ -633,15 +633,6 @@ scrubber_datadir = /var/lib/glance/scrubber
# Base directory that the Image Cache uses
image_cache_dir = /var/lib/glance/image-cache/
# =============== Manager Options =================================
# DEPRECATED. TO BE REMOVED IN THE JUNO RELEASE.
# Whether or not to enforce that all DB tables have charset utf8.
# If your database tables do not have charset utf8 you will
# need to convert before this option is removed. This option is
# only relevant if your database engine is MySQL.
#db_enforce_mysql_charset = True
# =============== Database Options =================================
[database]