Skip to content

Commit

Permalink
Preparing for 3.0.0 Havana release
Browse files Browse the repository at this point in the history
Updated Modulefile with current release version.
Updated README.md with deprecation warning and release notes.
Updated fixtures to point to stable/havana branch

Change-Id: I1e1f70d6ddaa41c0ac71b4d4b44c91d745ee3e8f
  • Loading branch information
Chris Hoge committed Nov 14, 2013
1 parent b78839e commit d3accf2
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 17 deletions.
36 changes: 27 additions & 9 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
16 changes: 8 additions & 8 deletions Modulefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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'
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'
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
--------

Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit d3accf2

Please sign in to comment.