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 369a2f08e560f67a8e64fec4f5884b4299193d15..750c35faccea49c79640e7808ef8713296267e0e 100644 (file)
--- 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 ba03c70e569c6bd4db1e7a3169962783252b3127..7dc7297d46078bf7c746a9f7c1b8fd9396b9e6fa 100644 (file)
--- 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'