diff --git a/.fixtures.yml b/.fixtures.yml index e85ac2c..d958ea8 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,14 +1,32 @@ fixtures: repositories: - 'cinder': 'git://github.com/stackforge/puppet-cinder' - "keystone": "git://github.com/stackforge/puppet-keystone.git" - "nova": "git://github.com/stackforge/puppet-nova.git" - "glance": "git://github.com/stackforge/puppet-glance.git" - 'horizon': 'git://github.com/stackforge/puppet-horizon' - 'swift' : 'git://github.com/stackforge/puppet-swift' - 'neutron': 'git://github.com/stackforge/puppet-neutron' - 'ceilometer' : 'git://github.com/stackforge/puppet-ceilometer' - 'heat' : 'git://github.com/stackforge/puppet-heat' + 'cinder': + repo: 'git://github.com/stackforge/puppet-cinder' + ref: 'stable/havana' + "keystone": + repo: "git://github.com/stackforge/puppet-keystone.git" + ref: 'stable/havana' + "nova": + repo: "git://github.com/stackforge/puppet-nova.git" + ref: 'stable/havana' + "glance": + repo: "git://github.com/stackforge/puppet-glance.git" + ref: 'stable/havana' + 'horizon': + repo: 'git://github.com/stackforge/puppet-horizon' + ref: 'stable/havana' + 'swift' : + repo: 'git://github.com/stackforge/puppet-swift' + ref: 'stable/havana' + 'neutron': + repo: 'git://github.com/stackforge/puppet-neutron' + ref: 'stable/havana' + 'ceilometer' : + repo: 'git://github.com/stackforge/puppet-ceilometer' + ref: 'stable/havana' + 'heat' : + repo: 'git://github.com/stackforge/puppet-heat' + ref: 'stable/havana' "apt": "git://github.com/puppetlabs/puppetlabs-apt.git" "apache": repo: "git://github.com/puppetlabs/puppetlabs-apache.git" diff --git a/Modulefile b/Modulefile index 2580b65..1ca3524 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'puppetlabs-openstack' -version '2.2.0' +version '3.0.0-rc1' source 'https://github.com/stackforge/puppet-openstack' author 'Puppet Labs' license 'Apache License 2.0' @@ -7,10 +7,10 @@ summary 'Puppet Labs Openstack Module targeted for Grizzly' description 'Puppet module that pulls together all the individual components of Openstack, resulting is a complete and functional stack.' project_page 'https://github.com/stackforge/puppet-openstack' -dependency 'puppetlabs/glance', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/horizon', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/keystone', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/nova', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/cinder', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/swift', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/quantum', '>= 2.2.0 <3.0.0' +dependency 'puppetlabs/glance', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/horizon', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/keystone', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/nova', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/cinder', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/swift', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/neutron', '>= 3.0.0 <4.0.0' diff --git a/README.md b/README.md index 19356ad..d3b46cf 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ openstack #### Table of Contents +0. [Deprecation Warning](#deprecation) 1. [Overview - What is the openstack module?](#overview) 2. [Module Description - What does the module do?](#module-description) 3. [Setup - The basics of getting started with cinder](#setup) @@ -13,6 +14,13 @@ openstack 8. [Contributors - Those with commits](#contributors) 9. [Release Notes - Notes on the most recent updates to the module](#release-notes) +Deprecation +----------- + +This implementation of the puppet-openstack module is deprecated, and will be removed for the OpenStack Icehouse release. +A new reference deployment based on the puppetlabs-grizzly module, and being updated for Havana, will replace the +functionality of this module. + Overview -------- @@ -505,6 +513,14 @@ Contributors Release Notes ------------- +**3.0.0** + +* Major release to support OpenStack Havana. +* Switches from puppet-quantum to puppet-neutron for networking. +* Change to ensure nova network compatible provisioning. +* Added support for alternate images with glance. +* Fixed bug to prevent dollar signs and single quote variable to be removed by shell. + **2.2.0** * Added support for syslog.