Limit puppet-mysql module version from the top
Since mysql::python was deprecated by 01/01/2014 (see https://github.com/puppetlabs/puppetlabs-mysql/ commit/c22e72a97a4665a17178f358db72c73c3a5c70db) all puppet modules' dependencies and spec's fixtures relying on puppetlabs-mysql module/repo would fail, if mysql::python is used as is in Fuel now, thus should be fixed approrpiately, i.e.: 1) limit mysql dependencies in Modulefiles to <1.0.0 according to their upstream versions (see https://bugs.launchpad.net/puppet-openstack/+bug/1271168) 2) add "ref: 'origin/0.x'" for mysql repos in .fixtures.yml Closes-bug: #1270807 Change-Id: I28a0de33b6b749eb7f0270af02c4b369a032a13e Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
parent
61f91c14dc
commit
7a0da6f69e
|
@ -10,4 +10,4 @@ project_page 'https://launchpad.net/ceilometer'
|
|||
# Dependencies
|
||||
dependency 'puppetlabs/stdlib', '>= 3.2.0'
|
||||
dependency 'cprice404/inifile', '>= 0.9.0'
|
||||
dependency 'puppetlabs/mysql', '>= 0.5.0'
|
||||
dependency 'puppetlabs/mysql', '>= 0.5.0 <1.0.0'
|
||||
|
|
|
@ -2,7 +2,9 @@ fixtures:
|
|||
repositories:
|
||||
"apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
|
||||
"keystone": "git://github.com/puppetlabs/puppetlabs-keystone.git"
|
||||
"mysql": "git://github.com/puppetlabs/puppetlabs-mysql.git"
|
||||
"mysql":
|
||||
repo: "git://github.com/puppetlabs/puppetlabs-mysql.git"
|
||||
ref: 'origin/0.x'
|
||||
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
|
||||
"rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq.git"
|
||||
'inifile': 'git://github.com/cprice-puppet/puppetlabs-inifile'
|
||||
|
|
|
@ -9,5 +9,5 @@ project_page 'http://github.com/puppetlabs/puppetlabs-glance'
|
|||
|
||||
dependency 'ripienaar/concat', '>= 0.1.0'
|
||||
dependency 'puppetlabs/keystone', '>= 0.1.0'
|
||||
dependency 'puppetlabs/mysql', '>= 0.3.0'
|
||||
dependency 'puppetlabs/mysql', '>= 0.3.0 <1.0.0'
|
||||
dependency 'puppetlabs/stdlib', '>= 2.3.0'
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
fixtures:
|
||||
repositories:
|
||||
"apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
|
||||
"mysql": "git://github.com/puppetlabs/puppetlabs-mysql.git"
|
||||
"mysql":
|
||||
repo: "git://github.com/puppetlabs/puppetlabs-mysql.git"
|
||||
ref: 'origin/0.x'
|
||||
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
|
||||
"inifile": 'git://github.com/cprice-puppet/puppetlabs-inifile'
|
||||
symlinks:
|
||||
|
|
|
@ -7,3 +7,4 @@ project_page 'http://github.com/puppetlabs/puppetlabs-keystone'
|
|||
source 'git://github.com/puppetlabs/puppetlabs-keystone'
|
||||
summary 'Keystone Puppet Module'
|
||||
description 'Openstack Keystone module. Tested on Ubuntu and RHEL 6'
|
||||
dependency 'puppetlabs/mysql','>=0.3.0 <1.0.0'
|
||||
|
|
|
@ -4,7 +4,7 @@ version '0.2.2'
|
|||
author 'Joe Topjian,Endre Karlson,Emilien Macchi,Dan Bode'
|
||||
license 'Apache License 2.0'
|
||||
description 'Puppet module to install and configure the OpenStack network service, Quantum'
|
||||
dependency 'puppetlabs/mysql', '>=0.3.0'
|
||||
dependency 'puppetlabs/mysql', '>=0.3.0 <1.0.0'
|
||||
dependency 'cprice404/inifile', '>=0.9.0'
|
||||
dependency 'puppetlabs/stdlib', '>=2.4.0'
|
||||
dependency 'xenolog/l23network', '>=0.0.0'
|
||||
|
|
|
@ -2,7 +2,9 @@ fixtures:
|
|||
repositories:
|
||||
"apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
|
||||
"keystone": "git://github.com/puppetlabs/puppetlabs-keystone.git"
|
||||
"mysql": "git://github.com/puppetlabs/puppetlabs-mysql.git"
|
||||
"mysql":
|
||||
repo: "git://github.com/puppetlabs/puppetlabs-mysql.git"
|
||||
ref: 'origin/0.x'
|
||||
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
|
||||
"sysctl": "git://github.com/duritong/puppet-sysctl.git"
|
||||
"rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq.git"
|
||||
|
|
|
@ -9,7 +9,7 @@ project_page 'https://github.com/puppetlabs/puppetlabs-swift'
|
|||
|
||||
## Add dependencies, if any:
|
||||
dependency 'puppetlabs/keystone', '>= 0.1.0'
|
||||
dependency 'puppetlabs/mysql', '>= 0.3.0'
|
||||
dependency 'puppetlabs/mysql', '>= 0.3.0 <1.0.0'
|
||||
dependency 'puppetlabs/rsync', '>= 0.1.0'
|
||||
dependency 'puppetlabs/stdlib', '>= 2.3.0'
|
||||
dependency 'ripienaar/concat', '>= 0.1.0'
|
||||
|
|
Loading…
Reference in New Issue