Initial kilo updates

Change-Id: I385fb3e522b1080835c3feadfc1699cc7bf08db8
Partial-Bug: #1426424
This commit is contained in:
Mark Vanderwiel 2015-02-27 14:39:32 -06:00
parent 89948fea96
commit e12c8a9a85
7 changed files with 108 additions and 187 deletions

2
.gitignore vendored
View File

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

View File

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

84
.rubocop_todo.yml Normal file
View File

@ -0,0 +1,84 @@
# This configuration was generated by `rubocop --auto-gen-config`
# on 2015-02-27 14:34:42 -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/DeprecatedClassMethods:
Enabled: false
# Offense count: 6
# Cop supports --auto-correct.
Lint/StringConversionInInterpolation:
Enabled: false
# Offense count: 1
# Cop supports --auto-correct.
Lint/UnusedMethodArgument:
Enabled: false
# Offense count: 2
Metrics/AbcSize:
Max: 69
# Offense count: 9
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/ClassAndModuleChildren:
Enabled: false
# Offense count: 4
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/EmptyLinesAroundBlockBody:
Enabled: false
# Offense count: 1
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/FormatString:
Enabled: false
# Offense count: 2
# Configuration parameters: MinBodyLength.
Style/GuardClause:
Enabled: false
# Offense count: 2
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/IndentHash:
Enabled: false
# Offense count: 4
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/MultilineOperationIndentation:
Enabled: false
# Offense count: 1
# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
Style/Next:
Enabled: false
# Offense count: 9
# Cop supports --auto-correct.
# Configuration parameters: PreferredDelimiters.
Style/PercentLiteralDelimiters:
Enabled: false
# Offense count: 1
# Cop supports --auto-correct.
Style/SelfAssignment:
Enabled: false
# Offense count: 30
# Cop supports --auto-correct.
Style/SingleSpaceBeforeFirstArg:
Enabled: false
# Offense count: 2
# Cop supports --auto-correct.
Style/UnneededCapitalW:
Enabled: false

View File

@ -1,167 +0,0 @@
# CHANGELOG for cookbook-openstack-compute
This file is used to list changes made in each version of cookbook-openstack-compute.
## 10.0.0
* Upgrading to Juno
* Sync conf files with Juno
* Upgrading berkshelf from 2.0.18 to 3.1.5
* rng_dev_path in nova.conf configured from node attribute
* Add cafile, memcached_servers, memcache_security_strategy, memcache_secret_key, insecure and hash_algorithms so that they are configurable.
* Update nova.conf mode from 644 to 640
* Add support vnc_keymap from attribute ( default: en-us )
* Add vnc attributes for ssl_only, cert and key
* Bump Chef gem to 11.16
* Separate endpoints for vncserver_listen and vncserver_proxyclient_address
* Add more neutron section attributes
* Add glance_api_insecure and neutron_api_insecure; make glance_api_servers and neutron_url to be prefixed with scheme
* Add [ssl] section, needed to communicate with Glance when using https; add cinder_ca_certificates_file and cinder_api_insecure
* Add more attributes for nova.conf DEFAULT section
* Update and remove the outdated options
* Add cinder_catalog_info
* Updated the nova-networking to start metadata-api
* Allow rabbit ssl in the ha case
* Move deprecated neutron_*/glance_*/cinder_* configurations to [neutron]/[glance]/[cinder] sections in nova.conf
* Allow dbsync_timeout to be configurable
* Make libvirtd service started prior to nova compute service
* Add [upgrade_levels] in nova.conf to enable rpc API compatible with order version
* Add dependency on upstream ceph cookbook for better key management
* Use common specific_endpoint routines (bug 1412919)
* Update default filters to match base stable openstack juno
* Make use of new metadata endpoint in common
* Doc floating ip keys that were missing, recipe logic was already there
## 9.3.1
* Move auth configuration from api-paste.ini to nova.conf
* fix fauxhai version for suse and redhat
* Allow scheduler_available_filters and compute_manager to have attribute overrides
* Allow rootwrap.conf attributes
## 9.3.0
* python_packages database client attributes have been migrated to the -common cookbook
* bump berkshelf to 2.0.18 to allow Supermarket support
* Allow metadata listen host and port to be configured
## 9.2.10
* Allow flat_injected and use_ipv6 to have attribute overrides
## 9.2.9
* Allow live migration to have attribute overrides
## 9.2.8
* Allow inject_partition to have attribute overrides
## 9.2.7
* Remove the storage_availability_zone settings
## 9.2.6
* Allow resize_confirm_window to have attribute overrides
## 9.2.5
* Create state and lock directories
## 9.2.4
* Allow dnsmasq_config_file to have attribute overrides
## 9.2.3
* Allow unix_sock_rw_perms to have attribute overrides
## 9.2.2
* Fix to allow workers to have attribute overrides
## 9.2.1
* Fix to allow compute driver attributes
## 9.2.0
* Get VMware vCenter password from databag
## 9.1.1
* Fix package action to allow updates
## 9.1.0
* Remove openrc, it's been moved to Common
## 9.0.1
### Bug
* Add network_allocate_retries option to nova.conf template
## 9.0.0
* Upgrade to Icehouse
## 8.4.2
* Fixing allow nova compute and ec2 ip and port to be configured
## 8.4.1
### Bug
* Fix the DB2 ODBC driver issue
## 8.4.0
### Blue print
* Use the library method auth_uri_transform
## 8.3.1
* Fixes including api-metadata recipe only when asked for (LP: 1286300)
## 8.3.0
* VMware compute driver support
## 8.2.1:
* Add the libvirt_inject_key attribute, defaults to true
* Add metering attributes
## 8.2.0
* Add client recipe
## 8.1.0
* Update to reflect changes in v3 of yum cookbook. Yum v3 now required.
## 8.0.0
* Branch for Havana. Add neutron support by search/replace quantum with neutron
## 7.3.0
* Add new attributes: auto_assign_floating_ip, disk_allocation_ratio, allow_resize_to_same_host
and force_dhcp_release
## 7.2.4
### Bug
* Fixing console auth service and process names for RHEL (LP: 1256456)
## 7.2.3
* relax the dependencies to the 7.x series
## 7.2.2
### Bug
* Setting the libvirt_cpu_mode is none when libvirt_type is qemu (LP: 1255840)
## 7.2.1
* Add new attributes for common rpc configuration
## 7.2.0:
* adds qpid support. defaults to rabbit
## 7.1.0:
* adds the enabled_apis attribute, defaults to 'ec2,osapi_compute,metadata'
## 7.0.3:
* adds the libvirt_inject_password attribute, defaults to false
## 7.0.2:
* add the new attribute dbus_service settings for different OS platform.
## 7.0.2:
* Check the run_context.loaded_recipes rather than the run_list, since the
'openstack-network::server' recipe is most likely contained in a role and
not explicitly in the run_list.
* The sysctl cookbook is unused and was removed as a dependency.
## 7.0.1:
* Adding attributes for libvirtd.conf settings (max_clients, max_workers,
max_requests, max_client_requests).
## 7.0.0:
* Initial release of cookbook-openstack-compute.
- - -
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' source 'https://rubygems.org'
gem 'chef', '~> 11.16.0' gem 'chef', '~> 11.18.6'
gem 'json', '<= 1.7.7' # chef 11 dependency gem 'json', '<= 1.7.7' # chef 11 dependency
gem 'berkshelf', '~> 3.1.5' gem 'berkshelf', '~> 3.2.1'
gem 'hashie', '~> 2.0' gem 'hashie', '~> 2.0'
gem 'chefspec', '~> 4.0.0' gem 'chefspec', '~> 4.0.0'
gem 'rspec', '~> 3.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'
gem 'fauxhai', '>= 2.1.0'

View File

@ -565,16 +565,16 @@ default['openstack']['compute']['vmware']['integration_bridge'] = 'br-int'
# but release name alias are also supported. # but release name alias are also supported.
# options e.g.: # options e.g.:
# default['openstack']['compute']['upgrade_levels'] = { # default['openstack']['compute']['upgrade_levels'] = {
# 'baseapi' => 'juno', # 'baseapi' => 'kilo',
# 'console' => 'juno', # 'console' => 'kilo',
# 'consoleauth' => 'juno', # 'consoleauth' => 'kilo',
# 'cert' => 'juno', # 'cert' => 'kilo',
# 'scheduler' => 'juno', # 'scheduler' => 'kilo',
# 'compute' => 'juno', # 'compute' => 'kilo',
# 'intercell' => 'juno', # 'intercell' => 'kilo',
# 'conductor' => '2.0', # 'conductor' => '2.0',
# 'network' => '3.0', # 'network' => '3.0',
# 'cells' => 'juno' # 'cells' => 'kilo'
# } # }
# choose the needed ones to set # choose the needed ones to set
default['openstack']['compute']['upgrade_levels'] = nil default['openstack']['compute']['upgrade_levels'] = nil

View File

@ -4,7 +4,7 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com'
license 'Apache 2.0' license 'Apache 2.0'
description 'The OpenStack Compute service Nova.' description 'The OpenStack Compute service Nova.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '10.0.0' version '11.0.0'
recipe 'openstack-compute::api-ec2', 'Installs AWS EC2 compatible API' recipe 'openstack-compute::api-ec2', 'Installs AWS EC2 compatible API'
recipe 'openstack-compute::api-metadata', 'Installs the nova metadata package' recipe 'openstack-compute::api-metadata', 'Installs the nova metadata package'
@ -27,9 +27,9 @@ recipe 'openstack-compute::vncproxy', 'Installs and configures the vncproxy serv
end end
depends 'ceph', '~> 0.8.0' depends 'ceph', '~> 0.8.0'
depends 'openstack-common', '>= 10.4.0' depends 'openstack-common', '>= 11.0.0'
depends 'openstack-identity', '>= 10.0.0' depends 'openstack-identity', '>= 11.0.0'
depends 'openstack-image', '>= 10.0.0' depends 'openstack-image', '>= 11.0.0'
depends 'openstack-network', '>= 10.0.0' depends 'openstack-network', '>= 11.0.0'
depends 'selinux', '~> 0.7.2' depends 'selinux', '~> 0.7.2'
depends 'python', '~> 1.4.6' depends 'python', '~> 1.4.6'