From: Chris Hoge <chris.hoge@puppetlabs.com>
Date: Thu, 9 Jan 2014 00:20:19 +0000 (-0800)
Subject: Fixed mysql dependency to match other modules
X-Git-Tag: 3.0.0-rc3~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2f4ac2e4af45a025a1fc9b668c8feb4e0274c53e;p=puppet-modules%2Fpuppet-ceilometer.git

Fixed mysql dependency to match other modules

Fixed the mysql dependency to match the other puppet-openstack modules.

Change-Id: I8ad1011f892e2cadfbfa3fa4ca932fae9ded5cf0
(cherry picked from commit 49f814a58cc7594584673564ce56996e34cc09ac)

Conflicts:
	.fixtures.yml
	Modulefile

Change-Id: I8ad1011f892e2cadfbfa3fa4ca932fae9ded5cf0
---

diff --git a/.fixtures.yml b/.fixtures.yml
index 369a2f0..750c35f 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -4,7 +4,9 @@ fixtures:
     'keystone':
       repo: 'git://github.com/stackforge/puppet-keystone.git'
       ref: 'stable/havana'
-    'mysql': 'git://github.com/puppetlabs/puppetlabs-mysql.git'
+    'mysql':
+      repo: 'git://github.com/puppetlabs/puppetlabs-mysql.git'
+      ref:  'origin/0.x'
     'nova':
       repo: 'git://github.com/stackforge/puppet-nova.git'
       ref: 'stable/havana'
diff --git a/Modulefile b/Modulefile
index ba03c70..7dc7297 100644
--- a/Modulefile
+++ b/Modulefile
@@ -11,4 +11,4 @@ project_page 'https://launchpad.net/puppet-ceilometer'
 dependency 'puppetlabs/keystone', '>=3.0.0 <4.0.0'
 dependency 'puppetlabs/stdlib', '>= 3.2.0'
 dependency 'puppetlabs/inifile', '>=1.0.0 <2.0.0'
-dependency 'puppetlabs/mysql', '>= 0.5.0'
+dependency 'puppetlabs/mysql', '>=0.6.1 <1.0.0'