Skip to content
This repository has been archived by the owner on Jun 5, 2020. It is now read-only.

Commit

Permalink
Full overhaul with tests
Browse files Browse the repository at this point in the history
This commit is an almost complete refactor of the previous module. It removes
some of the levers and switches with the repos and instead of using the name of
a mock config to figure out how it is laid out, this uses the parameters of a
mock config to determine its name. The entry point of init.pp now collects some
common params and hands them down to the other manifests if provided.
  • Loading branch information
haus committed Nov 13, 2012
1 parent 1ae07ff commit 40e2120
Show file tree
Hide file tree
Showing 28 changed files with 577 additions and 936 deletions.
3 changes: 2 additions & 1 deletion Rakefile
@@ -1,2 +1,3 @@
require 'rubygems'
require 'rake'
require 'rspec/core/rake_task'
require 'puppetlabs_spec_helper/rake_tasks'
28 changes: 25 additions & 3 deletions manifests/init.pp
@@ -1,6 +1,28 @@
class rpmbuilder {
class rpmbuilder(
$fedora_releases = undef,
$el_releases = undef,
$vendor = undef,
$mock_root = undef,
$proxy = undef,
$pe = false,
$pe_vers = undef,
) {
include rpmbuilder::repos
include rpmbuilder::packages::essential
include rpmbuilder::packages::extra
include rpmbuilder::mock::puppetlabs_mocks

class { rpmbuilder::mock::puppetlabs_mocks:
fedora_releases => $fedora_releases,
el_releases => $el_releases,
vendor => $vendor,
proxy => $proxy,
mock_root => $mock_root,
}

if $pe {
include rpmbuilder::packages::extra
class { rpmbuilder::mock::pe_mocks:
pe_vers => $pe_vers,
mock_root => $mock_root,
}
}
}
20 changes: 20 additions & 0 deletions manifests/mock/create_mock.pp
@@ -0,0 +1,20 @@
define rpmbuilder::mock::create_mock (
$dist = undef,
$release = undef,
$proxy = false,
$vendor = "Puppet User",
$arch = undef,
$dev = false,
$mock_root = "/etc/mock",
) {

file { $name:
path => "${mock_root}/${name}.cfg",
owner => "root",
group => "mock",
ensure => present,
content => template("rpmbuilder/mock-config.erb"),
mode => "0644",
}

}
31 changes: 0 additions & 31 deletions manifests/mock/pe_config.pp

This file was deleted.

16 changes: 16 additions & 0 deletions manifests/mock/pe_mock.pp
@@ -0,0 +1,16 @@
define rpmbuilder::mock::pe_mock(
$pe_ver,
$dist = "el",
$release,
$arch,
$mock_root = "/etc/mock"
) {
file { $name:
path => "${mock_root}/${name}.cfg",
owner => "root",
group => "mock",
ensure => present,
content => template("rpmbuilder/pe-mock-config.erb"),
mode => "0644",
}
}

0 comments on commit 40e2120

Please sign in to comment.