From b689f85d4f8d81eb8d1d1fc26a9f48acf71c1c41 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 24 Nov 2015 10:09:32 +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: I486d81c39db3d0cdac12e3db72ad3e82299a2d67
---
 CHANGELOG.md                   | 19 +++++++++++++++++++
 README.md                      |  2 +-
 Rakefile                       |  2 +-
 metadata.json                  |  2 +-
 spec/spec_helper_acceptance.rb |  2 +-
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9bb37b..6c0a4b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+##2015-11-24 - 7.0.0
+###Summary
+
+This is a backwards-incompatible major release for OpenStack Liberty.
+
+####Backwards-incompatible changes
+- repo: bump to Liberty by default
+
+####Features
+- repo/ubuntu: allow to change uca repo name
+
+####Maintenance
+- implement acceptance tests
+- try to use zuul-cloner to prepare fixtures
+- remove class_parameter_defaults puppet-lint check
+- acceptance: use common bits from puppet-openstack-integration
+- fix RSpec 3.x syntax
+- initial msync run for all Puppet OpenStack modules
+
 ##2015-07-08 - 6.0.0
 ###Summary
 
diff --git a/README.md b/README.md
index ec351fc..7f86a40 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 openstack_extras
 ============
 
-6.0.0 - 2015.1.0 - Kilo
+7.0.0 - 2015.2.0 - Liberty
 
 #### Table of Contents
 
diff --git a/Rakefile b/Rakefile
index ed79bea..9692ffd 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 9794332..8d18f49 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "openstack-openstack_extras",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "author": "OpenStack Contributors",
   "summary": "Puppet OpenStack Extras Module",
   "license": "Apache-2.0",
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 429e807..15e8cc9 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"