From 06913c91e2d2e63bb34a07adab10fa250c8833dc Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Wed, 19 Jul 2017 14:40:34 -0600
Subject: [PATCH] Pin puppet to 4.10.3

Puppet 4.10.4 errors when running the syntax jobs under ruby 2.0.0 so we
need to pin to 4.10.3 for the stable branches.

Change-Id: If663c5982029178f9a33580cf7ff71d9287e2a21
(cherry picked from commit 395a09632fd2bd68eb333431bb616a5be446a16c)
---
 functions                            | 3 +++
 puppet-openstack_spec_helper.gemspec | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/functions b/functions
index d37ffe7..cd55998 100644
--- a/functions
+++ b/functions
@@ -19,6 +19,9 @@ install_gems() {
   # Modify Gemfile to use local library and not the one on git
   # so we can actually test the current state of the gem.
   sed -i "s/.*git     => 'https:\/\/git.openstack.org\/openstack\/puppet-openstack_spec_helper.*/      :path => '..\/..',/" Gemfile
+  # NOTE(aschultz): in order for this to work we need to nuke the branch line
+  # since we're replacing the repository with a path
+  sed -i "/.*branch[[:space:]]*=> 'stable\/.*/d" Gemfile
 
   # Install dependencies
   gem install bundler --no-rdoc --no-ri --verbose
diff --git a/puppet-openstack_spec_helper.gemspec b/puppet-openstack_spec_helper.gemspec
index 2daf19a..8a3fd06 100644
--- a/puppet-openstack_spec_helper.gemspec
+++ b/puppet-openstack_spec_helper.gemspec
@@ -39,6 +39,10 @@ Gem::Specification.new do |spec|
   # fog-core 1.44.0 requires xmlrpc 0.3.0 which requires ruby 2.3.0 which is not available on centos7
   spec.add_dependency 'fog-core', ['< 1.44.0']
 
+  # puppet 4.10.4 added in a failure when using ruby 2.0.0, so we need to cap
+  # puppet at 4.10.3 to fix CI
+  spec.add_dependency 'puppet', ['< 4.10.4']
+
   # Beaker 3.0.0 fails to run in Puppet Openstack CI
   # LoadError: cannot load such file -- serverspec
   # While we're investigating it, let's pin Beaker to 2.x releases.