From e466420707a7ff2fdd9518aefc0c7c74ae2dbae6 Mon Sep 17 00:00:00 2001
From: Chris Hoge <chris.hoge@puppetlabs.com>
Date: Mon, 7 Oct 2013 15:06:26 -0700
Subject: [PATCH] Preparing for 2.2.0 release.

Updated dependencies and version in Modulefile.
Updated release notes in README.md

Change-Id: Ia9a9b8ed0275ab33335aaf47f1ec054fd233a007
---
 Modulefile | 16 ++++++++--------
 README.md  | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Modulefile b/Modulefile
index dc46cfd..2580b65 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-openstack'
-version '2.1.0'
+version '2.2.0'
 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.1.0 <3.0.0'
-dependency 'puppetlabs/horizon', '>= 2.1.0 <3.0.0'
-dependency 'puppetlabs/keystone', '>= 2.1.0 <3.0.0'
-dependency 'puppetlabs/nova', '>= 2.1.0 <3.0.0'
-dependency 'puppetlabs/cinder', '>= 2.1.0 <3.0.0'
-dependency 'puppetlabs/swift', '>= 2.1.0 <3.0.0'
-dependency 'puppetlabs/quantum', '>= 2.1.1 <3.0.0'
+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'
diff --git a/README.md b/README.md
index 1e27a38..19356ad 100644
--- a/README.md
+++ b/README.md
@@ -505,6 +505,22 @@ Contributors
 Release Notes
 -------------
 
+**2.2.0**
+
+* Added support for syslog.
+* Added passing keystone_host to controller class to support non-local keystone server.
+* Added parameter for memcached_servers to support multiple memcache servers.
+* Fixed bug to make vncserver_listen default to internal_address if not set.
+* Added force_config_drive to openstack::all.
+* Added support for rdb volumes.
+* Added support for rdb as glance backend.
+* Added ovs network provider.
+* Added support for keystone token_format and token_driver.
+* Fixed reference to 'quantum' repository to reflect upstream change to puppet-neutron.
+* Added support for security_group_api.
+* Fixed swift keystone authentication endpoints.
+* Fixed selinux logic for horizon.
+
 **2.1.0**
 
 * Added support for Neutron OVS VLAN networking.