openstack/fuel-library
Code Issues Proposed changes

Pull stable/mitaka branch of puppet modules

Browse Source 
We should switch to stable/mitaka branch of puppet modules
for stable/mitaka branch of Fuel. Once the development of
Newton Fuel will be started the refs will be returned to master.

Change-Id: If9ce7009acab8cf83a9b82e1347447adefb18e5b
This commit is contained in:
iberezovskiy 2016-03-25 13:09:30 +03:00 committed by Ivan Berezovskiy
parent 945894f0b2
commit 36eb3a8ee5
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
deployment/puppet/openstack_tasks/Puppetfile
View File

@ -24,69 +24,69 @@
# Pull in puppet-aodh
mod 'aodh',
:git => 'https://github.com/fuel-infra/puppet-aodh.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-ceilometer
mod 'ceilometer',
:git => 'https://github.com/fuel-infra/puppet-ceilometer.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in openstack-cinder
mod 'cinder',
:git => 'https://github.com/fuel-infra/openstack-cinder.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-glance
mod 'glance',
:git => 'https://github.com/fuel-infra/puppet-glance.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-heat
mod 'heat',
:git => 'https://github.com/fuel-infra/puppet-heat.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-horizon
mod 'horizon',
:git => 'https://github.com/fuel-infra/puppet-horizon.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-ironic
mod 'ironic',
:git => 'https://github.com/fuel-infra/puppet-ironic.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-keystone
mod 'keystone',
:git => 'https://github.com/fuel-infra/puppet-keystone.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-openstacklib
mod 'openstacklib',
:git => 'https://github.com/fuel-infra/puppet-openstacklib.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-neutron
mod 'neutron',
:git => 'https://github.com/fuel-infra/puppet-neutron.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-nova
mod 'nova',
:git => 'https://github.com/fuel-infra/puppet-nova.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-murano
mod 'murano',
:git => 'https://github.com/fuel-infra/puppet-murano.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-sahara
mod 'sahara',
:git => 'https://github.com/fuel-infra/puppet-sahara.git',
:ref => 'master'
:ref => 'stable/mitaka'
# Pull in puppet-swift
mod 'swift',
:git => 'https://github.com/fuel-infra/puppet-swift.git',
:ref => 'master'
:ref => 'stable/mitaka'

2
utils/jenkins/fuel_validate_puppetfile.rb
View File

@ -34,7 +34,7 @@ module PuppetfileValidator
puts "INFO: validating module '#{name}'"
if args.is_a? Hash and args.has_key?(:git) and args.has_key?(:ref)
if validate_repo(args[:git])
if args[:ref] == 'master' or validate_ref(args[:git], args[:ref])
if args[:ref] == 'master' or args[:ref] =~ /stable\/.*/ or validate_ref(args[:git], args[:ref])
puts "INFO: module '#{name}' is valid"
else
@valid = false