From 312546c2b38c133b7b093853a3dd38dc0ac0a091 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 25 Nov 2015 11:02:48 +0100
Subject: [PATCH] release: prepare 7.0.0 (liberty)

This patch prepares this Puppet module to be released in 7.x series (Liberty)
with 7.0.0.

Change-Id: I1e99e2eb980bb84340c2ff8d1a3cad3be2106685
---
 CHANGELOG.md                   | 52 ++++++++++++++++++++++++++++++++++
 README.md                      |  2 +-
 Rakefile                       |  2 +-
 metadata.json                  |  6 ++--
 spec/spec_helper_acceptance.rb |  2 +-
 5 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a741ab0b..da520ebb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,55 @@
+##2015-11-25 - 7.0.0
+###Summary
+
+This is a backwards-incompatible major release for OpenStack Liberty.
+
+####Backwards-incompatible changes
+- rabbitmq: do not manage rabbitmq service anymore
+- remove deprecated mysql_module
+- change section name for AMQP qpid parameters
+- change section name for AMQP rabbit parameters
+
+####Features
+- make it possible to have multiple type_sets with the same value
+- keystone/auth: make service description configurable
+- add support for RabbitMQ connection heartbeat
+- add tag to package and service resources
+- sync cinder::db::sync with new standard
+- set parameter host in vmdk backend
+- add lock_path to cinder config
+- add 'host' parameter to cinder.conf
+- add an ability to manage use_stderr parameter
+- reflect provider change in puppet-openstacklib
+- introduce cinder::db class
+- add support for Pure Volume Drivers
+- implement class and defined type for cinder GPFS driver
+- allow RBD host to be configurable
+- add posibility to specify privileged user for Cinder
+- switch cinder to use os_service_default
+- simplify rpc_backend parameter
+- put all the logging related parameters to the logging class
+- specify a dedicated keystone user for cinderv2
+- db: Use postgresql lib class for psycopg package
+- add kombu_reconnect_delay parameter to cinder
+- allow customization of db sync command line
+- add possibility to use list of qpid hosts in cinder
+
+####Bugfixes
+- rely on autorequire for config resource ordering
+- dont run losetup if it's been done already
+- don't run vgcreate if vg exists
+- make sure cinder user is created before creating Cinder::Type
+- type: Add retry to Exec resource
+
+####Maintenance
+- fix rspec 3.x syntax
+- initial msync run for all Puppet OpenStack modules
+- acceptance: enable debug & verbosity for OpenStack logs
+- try to use zuul-cloner to prepare fixtures
+- remove class_parameter_defaults puppet-lint check
+- add test coverage for cinder::db::mysql
+- acceptance: use common bits from puppet-openstack-integration
+
 ##2015-10-10 - 6.1.0
 ###Summary
 
diff --git a/README.md b/README.md
index af609d1f..cff85d8f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 cinder
 =======
 
-6.1.0 - 2015.1 - Kilo
+7.0.0 - 2015.2 - Liberty
 
 #### Table of Contents
 
diff --git a/Rakefile b/Rakefile
index ed79bead..9692ffdd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -58,7 +58,7 @@ task :spec_prep do
       zuul_clone_cmd += ['git://git.openstack.org', "#{repo}"]
       sh(*zuul_clone_cmd)
     else
-      sh("git clone https://git.openstack.org/#{repo} #{repo}")
+      sh("git clone https://git.openstack.org/#{repo} -b stable/liberty #{repo}")
     end
     script = ['env']
     script += ["PUPPETFILE_DIR=#{Dir.pwd}/spec/fixtures/modules"]
diff --git a/metadata.json b/metadata.json
index 5842eca8..3253b2e3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "openstack-cinder",
-  "version": "6.1.0",
+  "version": "7.0.0",
   "author": "Puppet Labs and OpenStack Contributors",
   "summary": "Puppet module for OpenStack Cinder",
   "license": "Apache-2.0",
@@ -33,9 +33,9 @@
   "dependencies": [
     { "name": "dprince/qpid", "version_requirement": ">=1.0.0 <2.0.0" },
     { "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
-    { "name": "openstack/keystone", "version_requirement": ">=6.0.0 <7.0.0" },
+    { "name": "openstack/keystone", "version_requirement": ">=7.0.0 <8.0.0" },
     { "name": "puppetlabs/rabbitmq", "version_requirement": ">=2.0.2 <6.0.0" },
     { "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
-    { "name": "openstack/openstacklib", "version_requirement": ">=6.0.0 <7.0.0" }
+    { "name": "openstack/openstacklib", "version_requirement": ">=7.0.0 <8.0.0" }
   ]
 }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 429e807c..15e8cc97 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -38,7 +38,7 @@ RSpec.configure do |c|
         zuul_clone_cmd += "git://git.openstack.org #{repo}"
         on host, zuul_clone_cmd
       else
-        on host, "git clone https://git.openstack.org/#{repo} #{repo}"
+        on host, "git clone https://git.openstack.org/#{repo} -b stable/liberty #{repo}"
       end
 
       on host, "ZUUL_REF=#{zuul_ref} ZUUL_BRANCH=#{zuul_branch} ZUUL_URL=#{zuul_url} bash #{repo}/install_modules.sh"