Pin rabbitmq module

This commit pins rabbitmq to a known working revision to fix failing unit tests
and unblock code merged.

It also assumes that the module can no longer track master of upstream
repos and removes other_repos.yaml b/c it did not supported individual branches.

Change-Id: I8e473740dcf0085fb8d5313959983a0f410faf55
This commit is contained in:
Dan Bode
2013-07-18 14:23:09 -07:00
parent 0171281241
commit 93b56beba6
4 changed files with 4 additions and 80 deletions

View File

@@ -13,7 +13,9 @@ fixtures:
"concat": "git://github.com/ripienaar/puppet-concat.git" "concat": "git://github.com/ripienaar/puppet-concat.git"
"firewall": "git://github.com/puppetlabs/puppetlabs-firewall.git" "firewall": "git://github.com/puppetlabs/puppetlabs-firewall.git"
"mysql": "git://github.com/puppetlabs/puppetlabs-mysql.git" "mysql": "git://github.com/puppetlabs/puppetlabs-mysql.git"
"rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq" "rabbitmq":
repo: "git://github.com/puppetlabs/puppetlabs-rabbitmq"
ref: 9eadc4274b5a70fd55d036b0365f63e90325d5a7
'memcached': 'git://github.com/saz/puppet-memcached' 'memcached': 'git://github.com/saz/puppet-memcached'
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git" "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
"sysctl": "git://github.com/duritong/puppet-sysctl.git" "sysctl": "git://github.com/duritong/puppet-sysctl.git"

View File

@@ -397,9 +397,7 @@ class { 'openstack::auth_file':
The classes included in the Openstack module are implemented using a number of other modules. These modules can be used directly to create a customized openstack deployment. The classes included in the Openstack module are implemented using a number of other modules. These modules can be used directly to create a customized openstack deployment.
A list of the modules used by puppetlabs-openstack and the source locations for those modules can be found in `other_repos.yaml` in the openstack module folder. The full list of modules, their source locations, as well as the revisions that have been tested are available in the file .fixtures.yaml.
other_repos.yaml
These building block modules have been written to support a wide variety of specific configuration and deployment use cases. They also provide a lot of configuration options not available with the more constrained puppetlabs-openstack modules. These building block modules have been written to support a wide variety of specific configuration and deployment use cases. They also provide a lot of configuration options not available with the more constrained puppetlabs-openstack modules.

View File

@@ -14,48 +14,6 @@ rescue LoadError
puts "!!!!!" puts "!!!!!"
end end
repo_file = 'other_repos.yaml'
default_modulepath = '/etc/puppet/modules'
namespace :modules do
desc 'clone all required modules'
task :clone do
repo_hash = YAML.load_file(File.join(File.dirname(__FILE__), repo_file))
repos = (repo_hash['repos'] || {})
modulepath = (repo_hash['modulepath'] || default_modulepath)
repos_to_clone = (repos['repo_paths'] || {})
branches_to_checkout = (repos['checkout_branches'] || {})
repos_to_clone.each do |remote, local|
# I should check to see if the file is there?
outpath = File.join(modulepath, local)
output = `git clone #{remote} #{outpath}`
puts output
end
branches_to_checkout.each do |local, branch|
Dir.chdir(File.join(modulepath, local)) do
output = `git checkout #{branch}`
end
# Puppet.debug(output)
end
end
desc 'see if any of the modules are not up-to-date'
task 'status' do
repo_hash = YAML.load_file(File.join(File.dirname(__FILE__), repo_file))
repos = (repo_hash['repos'] || {})
modulepath = (repo_hash['modulepath'] || default_modulepath)
repos_to_clone = (repos['repo_paths'] || {})
branches_to_checkout = (repos['checkout_branches'] || {})
repos_to_clone.each do |remote, local|
# I should check to see if the file is there?
Dir.chdir(File.join(modulepath, local)) do
puts "Checking status of #{local}"
puts `git status`
end
end
end
end
namespace :github do namespace :github do
desc 'check all dependeny projects and generate a report about open pull requests' desc 'check all dependeny projects and generate a report about open pull requests'
task 'pull_request_stats' do task 'pull_request_stats' do

View File

@@ -1,34 +0,0 @@
# modulepath: /etc/puppet/modules
repos:
repo_paths:
# openstack git repos
git://github.com/stackforge/puppet-nova: nova
git://github.com/stackforge/puppet-glance: glance
git://github.com/stackforge/puppet-swift: swift
git://github.com/stackforge/puppet-keystone: keystone
git://github.com/stackforge/puppet-horizon: horizon
git://github.com/stackforge/puppet-cinder: cinder
git://github.com/stackforge/puppet-quantum: quantum
# openstack middleware
git://github.com/puppetlabs/puppetlabs-rabbitmq: rabbitmq
git://github.com/puppetlabs/puppetlabs-mysql: mysql
git://github.com/puppetlabs/puppetlabs-git: git
git://github.com/puppetlabs/puppetlabs-vcsrepo: vcsrepo
git://github.com/saz/puppet-memcached: memcached
git://github.com/puppetlabs/puppetlabs-rsync: rsync
git://github.com/puppetlabs/puppetlabs-apache: apache
git://github.com/bodepd/puppet-vswitch: vswitch
# other deps
git://github.com/puppetlabs/puppetlabs-xinetd: xinetd
git://github.com/saz/puppet-ssh: ssh
git://github.com/puppetlabs/puppetlabs-stdlib: stdlib
git://github.com/puppetlabs/puppetlabs-apt: apt
git://github.com/ripienaar/puppet-concat: concat
git://github.com/duritong/puppet-sysctl.git: sysctl
git://github.com/cprice-puppet/puppetlabs-inifile: inifile
checkout_branches:
# for some reason this is not checking out to master by default
cinder: master
# glance: dev
# nova: dev