From e500d20ce818f139f321dec6472e657e62925907 Mon Sep 17 00:00:00 2001
From: Chris Hoge <chris.hoge@puppetlabs.com>
Date: Thu, 14 Nov 2013 11:25:51 -0800
Subject: [PATCH] Preparing for 3.0.0 Havana release

Updated version and dependencies in Modulefile.
Updated fixtures to use stable/havana branch.
Updated release notes in README.md

Change-Id: I47c40017ea7db9f75ff7780fb1f82aedd03a74f6
---
 .fixtures.yml | 4 +++-
 Modulefile    | 4 ++--
 README.md     | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index fa126a21..0f69105d 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,7 +1,9 @@
 fixtures:
   repositories:
     "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
-    "keystone": "git://github.com/stackforge/puppet-keystone.git"
+    "keystone": 
+      repo: "git://github.com/stackforge/puppet-keystone.git"
+      ref:  'stable/havana'
     "mysql":
       repo: "git://github.com/puppetlabs/puppetlabs-mysql.git"
       ref:  'origin/0.x'
diff --git a/Modulefile b/Modulefile
index 1d8f868f..4eeede96 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-glance'
-version '2.2.0'
+version '3.0.0-rc1'
 source  'https://github.com/stackforge/puppet-glance'
 author  'Puppet Labs'
 license 'Apache License 2.0'
@@ -8,6 +8,6 @@ description 'Puppet module to install and configure the Openstack Glance image s
 project_page 'https://launchpad.net/puppet-openstack'
 
 dependency 'puppetlabs/inifile', '>=1.0.0 <2.0.0'
-dependency 'puppetlabs/keystone', '>=2.2.0 <3.0.0'
+dependency 'puppetlabs/keystone', '>=3.0.0 <4.0.0'
 dependency 'puppetlabs/mysql', '>=0.6.1 <1.0.0'
 dependency 'puppetlabs/stdlib', '>= 2.5.0'
diff --git a/README.md b/README.md
index 85a0769e..35b314e6 100644
--- a/README.md
+++ b/README.md
@@ -118,6 +118,11 @@ Contributors
 Release Notes
 -------------
 
+**3.0.0**
+
+* Major release for OpenStack Havana.
+* Fixed bug to ensure keystone endpoint is set before service starts.
+
 **2.2.0**
 
 * Added syslog support.