Merge "Updated to match semver and release notes."

Modulefile

@@ -1,5 +1,5 @@
 name    'puppetlabs-openstack'
-version '2.2.0'
+version '4.0.0-devel'
 source  'https://github.com/stackforge/puppet-openstack'
 author  'Puppet Labs'
 license 'Apache License 2.0'
@@ -7,10 +7,12 @@ 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/ceilometer', '>=4.0.0 <5.0.0'
+dependency 'puppetlabs/cinder', '>=4.0.0 <5.0.0'
+dependency 'puppetlabs/glance', '>=4.0.0 <5.0.0'
+dependency 'puppetlabs/heat', '>=4.0.0 <5.0.0'
+dependency 'puppetlabs/horizon', '>=4.0.0 <5.0.0'
+dependency 'puppetlabs/keystone', '>=4.0.0 <5.0.0'
+dependency 'puppetlabs/nova', '>=4.0.0 <5.0.0'
+dependency 'puppetlabs/quantum', '>=4.0.0 <5.0.0'
+dependency 'puppetlabs/swift', '>=4.0.0 <5.0.0'

README.md

@@ -13,6 +13,12 @@ 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-havana](https://github.com/puppetlabs/puppetlabs-havana)  module is under development.
+
 Overview
 --------