summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Vanderwiel <vanderwl@us.ibm.com>2015-02-27 14:45:47 -0600
committerMark Vanderwiel <vanderwl@us.ibm.com>2015-02-27 14:46:22 -0600
commit3d566f01463ceb6fc6a6846fef7bde8fee0d9742 (patch)
tree2a3f37192980d004ed6a64180a46b505700918ca
parent8736b36606be2c7843ae44c6fbc0e793a2e8bce1 (diff)
Initial kilo updates
Notes
Notes (review): Verified+2: Jenkins Code-Review+1: Ma Wen Cheng <wenchma@cn.ibm.com> Code-Review+2: Jan Klare <j.klare@x-ion.de> Workflow+1: Christopher M Luciano <cmlucian@us.ibm.com> Submitted-by: Jenkins Submitted-at: Thu, 05 Mar 2015 15:23:37 +0000 Reviewed-on: https://review.openstack.org/159996 Project: stackforge/cookbook-openstack-block-storage Branch: refs/heads/master
-rw-r--r--.gitignore6
-rw-r--r--.rubocop.yml9
-rw-r--r--.rubocop_todo.yml55
-rw-r--r--CHANGELOG.md136
-rw-r--r--Gemfile9
-rw-r--r--metadata.rb8
6 files changed, 73 insertions, 150 deletions
diff --git a/.gitignore b/.gitignore
index 5a29577..d7ee44a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
1.bundle/ 1.bundle/
2berks-cookbooks/ 2berks-cookbooks/
3.kitchen/ 3.kitchen
4.vagrant/ 4.vagrant
5.coverage/ 5.coverage/
6*.swp 6*.swp
7Berksfile.lock 7Berksfile.lock
8Gemfile.lock
9Vagrantfile 8Vagrantfile
9Gemfile.lock
diff --git a/.rubocop.yml b/.rubocop.yml
index 69447d8..5e0be9f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,7 @@
1inherit_from: .rubocop_todo.yml
2
1AllCops: 3AllCops:
2 Includes: 4 Include:
3 - metadata.rb 5 - metadata.rb
4 - Gemfile 6 - Gemfile
5 - attributes/** 7 - attributes/**
@@ -8,12 +10,15 @@ AllCops:
8 - recipes/** 10 - recipes/**
9 - resources/** 11 - resources/**
10 - spec/** 12 - spec/**
13 Exclude:
14 - .cookbooks/**/*
15 - berks-cookbooks/**/*
16 - .bundle/**/*
11 17
12Encoding: 18Encoding:
13 Exclude: 19 Exclude:
14 - metadata.rb 20 - metadata.rb
15 - Gemfile 21 - Gemfile
16 - berks-cookbooks/**
17 22
18NumericLiterals: 23NumericLiterals:
19 Enabled: false 24 Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 0000000..ec8987d
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,55 @@
1# This configuration was generated by `rubocop --auto-gen-config`
2# on 2015-02-27 14:45:01 -0600 using RuboCop version 0.29.1.
3# The point is for the user to remove these configuration records
4# one by one as the offenses are removed from the code base.
5# Note that changes in the inspected code, or installation of new
6# versions of RuboCop, may require this file to be generated again.
7
8# Offense count: 1
9Metrics/AbcSize:
10 Max: 28
11
12# Offense count: 5
13# Configuration parameters: EnforcedStyle, SupportedStyles.
14Style/ClassAndModuleChildren:
15 Enabled: false
16
17# Offense count: 3
18# Cop supports --auto-correct.
19# Configuration parameters: EnforcedStyle, SupportedStyles.
20Style/EmptyLinesAroundBlockBody:
21 Enabled: false
22
23# Offense count: 5
24# Cop supports --auto-correct.
25# Configuration parameters: EnforcedStyle, SupportedStyles.
26Style/FirstParameterIndentation:
27 Enabled: false
28
29# Offense count: 8
30# Configuration parameters: EnforcedStyle, SupportedStyles.
31Style/FormatString:
32 Enabled: false
33
34# Offense count: 1
35# Cop supports --auto-correct.
36# Configuration parameters: EnforcedStyle, SupportedStyles.
37Style/MultilineOperationIndentation:
38 Enabled: false
39
40# Offense count: 6
41# Cop supports --auto-correct.
42# Configuration parameters: PreferredDelimiters.
43Style/PercentLiteralDelimiters:
44 Enabled: false
45
46# Offense count: 13
47# Cop supports --auto-correct.
48Style/SingleSpaceBeforeFirstArg:
49 Enabled: false
50
51# Offense count: 1
52# Cop supports --auto-correct.
53# Configuration parameters: IgnoredMethods.
54Style/SymbolProc:
55 Enabled: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 354254a..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,136 +0,0 @@
1openstack-block-storage Cookbook CHANGELOG
2==============================
3This file is used to list changes made in each version of the openstack-block-storage cookbook.
4## 10.1.0
5* Use common specific_endpoint routines (bug 1412919)
6* Install qemu-img package for volume nodes
7* update iscsi_helper for RHEL7
8* update cinder_iscsitarget_packages for RHEL7
9* update cinder_iscsitarget_service for RHEL7
10
11## 10.0.1
12# Update cinder.conf mode from 0644 to 0640
13* Add attribute for ibmnas_platform_type
14* Allow cafile, insecure, memcached_servers, memcache_security_strategy, memcache_secret_key and hash_algorithms to be configurable
15* Bump Chef gem to 11.16
16* Update deprecated keystoneclient.middleware.auth_token in api-paste.ini
17* Add attributes for quota_snapshots, no_snapshot_gb_quota and use_default_quota_class
18* Add glance_api_insecure and make glance_api_servers to be prefixed with scheme
19* Add sysfsutils package for storwize/SVC driver
20* Add glance_ca_certificates_file
21* Add default_volume_type config option
22* Update gpfs volume driver path and fix gpfs_images_share_mode initialization
23* Change to cinder v2 service and endpoint
24* Add support for san_password with ibm.storwize_svc.StorwizeSVCDriver
25* Add glance_api_version config option
26* Allow san_private_key to be used instead of san_login for Storwize
27* Add dependency on upstream ceph cookbook for better key management
28
29## 10.0.0
30* Upgrading to Juno
31* Sync conf files with Juno
32* Upgrading berkshelf from 2.0.18 to 3.1.5
33* Move keystone keys into cinder.conf
34* Add attribute for osapi_volume_workers
35
36## 9.4.1
37* Add support for LVMISCSIDriver driver using block devices with LVM
38
39## 9.4.0
40* python_packages database client attributes have been migrated to
41the -common cookbook
42* bump berkshelf to 2.0.18 to allow Supermarket support
43* added rootwrap.conf as a template
44* fix fauxhai version for suse and redhat
45
46## 9.3.0
47### Blue print
48* Add multiple backend configuration support
49
50## 9.2.3
51* Fix for storwize_svc_vol_rsize default
52
53## 9.2.2
54### Bug
55* Add support for miscellaneous options (like in Compute)
56
57## 9.2.1
58### Bug
59* Remove output of extra config lines in cinder.conf.erb
60
61## 9.2.0
62### Blue print
63* Get VMware vCenter password from databag
64
65## 9.1.1
66* Fix package action to allow updates
67
68## 9.1.0
69### Blue print
70* Remove policy template
71
72## 9.0.1
73### Bug
74* Fix the depends cookbook version issue in metadata.rb
75
76## 9.0.0
77* Upgrade to Icehouse
78
79## 8.4.1
80### Bug
81* Fix the DB2 ODBC driver issue
82* Move control_exchange outside of 'rabbit'
83
84## 8.4.0
85### Blue print
86* Use the library method auth_uri_transform
87
88## 8.3.0
89* Rename openstack-metering to openstack-telemetry
90
91## 8.2.0
92* VMware VMDK driver support
93
94## 8.1.0
95* Add client recipe
96
97## 8.0.0
98### New version
99* Upgrade to upstream Havana release
100* Add support for Storwize/SVC configuration attributes
101
102## 7.2.2
103### Bug
104* fix a bug related to qpid.
105
106## 7.2.1
107### Bug
108* relax the dependencies to the 7.x series
109
110## 7.2.0
111### Improvement
112* Add qpid support for cinder. Default is rabbitmq
113
114## 7.1.0
115### Improvement
116* Add new attributes for common rpc configuration
117
118## 7.0.6
119### Bug
120* set auth_uri for authtoken in api-paste.ini (bug #1207504)
121
122## 7.0.4
123### Improvement
124* Use a default log-file (/var/log/cinder/cinder.log) if syslog is disabled
125
126## 7.0.3
127### Bug
128* change audit cronjob binary path depending on platform, refactored some tests
129
130## 7.0.2
131### Improvement
132* ensure cronjob runs on only one node and make cronjob configurable
133
134## 7.0.1
135### Improvement
136* Add audit cronjob and enable control_exchange, when metering enabled
diff --git a/Gemfile b/Gemfile
index daa81a9..14d48b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,11 @@
1# encoding: UTF-8 1# encoding: UTF-8
2source 'https://rubygems.org' 2source 'https://rubygems.org'
3 3
4gem 'chef', '~> 11.16' 4gem 'chef', '~> 11.18.6'
5gem 'json', '<= 1.7.7' # chef 11 dependency 5gem 'json', '<= 1.7.7' # chef 11 dependency
6gem 'berkshelf', '~> 3.1.5' 6gem 'berkshelf', '~> 3.2.1'
7gem 'hashie', '~> 2.0' 7gem 'hashie', '~> 2.0'
8gem 'chefspec', '~> 4.0.0' 8gem 'chefspec', '~> 4.0.0'
9gem 'rspec', '~> 3.0.0' 9gem 'rspec', '~> 3.0.0'
10gem 'foodcritic', '~> 3.0.3' 10gem 'foodcritic', '~> 4.0'
11gem 'rubocop', '~> 0.18.1' 11gem 'rubocop', '~> 0.29.1'
12gem 'fauxhai', '>= 2.1.0'
diff --git a/metadata.rb b/metadata.rb
index b3f9b30..1f29ad3 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -5,7 +5,7 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com'
5license 'Apache 2.0' 5license 'Apache 2.0'
6description 'The OpenStack Advanced Volume Management service Cinder.' 6description 'The OpenStack Advanced Volume Management service Cinder.'
7long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) 7long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
8version '10.1.0' 8version '11.0.0'
9 9
10recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone' 10recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone'
11recipe 'openstack-block-storage::client', 'Install packages required for cinder client' 11recipe 'openstack-block-storage::client', 'Install packages required for cinder client'
@@ -19,9 +19,9 @@ recipe 'openstack-block-storage::volume', 'Installs the cinder-volume
19end 19end
20 20
21depends 'apt', '~> 2.6.1' 21depends 'apt', '~> 2.6.1'
22depends 'openstack-common', '>= 10.2.0' 22depends 'openstack-common', '>= 11.0.0'
23depends 'openstack-identity', '>= 10.0.0' 23depends 'openstack-identity', '>= 11.0.0'
24depends 'openstack-image', '>= 10.0.0' 24depends 'openstack-image', '>= 11.0.0'
25depends 'selinux', '~> 0.7.2' 25depends 'selinux', '~> 0.7.2'
26depends 'python', '~> 1.4.6' 26depends 'python', '~> 1.4.6'
27depends 'ceph', '~> 0.8.0' 27depends 'ceph', '~> 0.8.0'