Permalink
Browse files

Merge pull request #15 from haus/remove_extras_class

Remove extras class
  • Loading branch information...
2 parents 37dca55 + 3f73f01 commit 6a41f5b5d1443c6d4a4c08c9d250dec064acc845 @MosesMendoza MosesMendoza committed Nov 15, 2012
View
1 manifests/init.pp
@@ -23,7 +23,6 @@
}
if $pe {
- include rpmbuilder::packages::extra
class { rpmbuilder::mock::pe_mocks:
pe_vers => $pe_vers,
mock_root => $mock_root,
View
4 manifests/mock/pe_mockset.pp
@@ -1,5 +1,5 @@
-define rpmbuilder::mock::pe_mockset(
- mock_root = "/etc/mock",
+define rpmbuilder::mock::pe_mockset (
+ $mock_root = "/etc/mock",
) {
rpmbuilder::mock::pe_mock { "pupent-${name}-el5-i386": pe_ver => $name, release => '5', arch => 'i386', mock_root => $mock_root, }
rpmbuilder::mock::pe_mock { "pupent-${name}-el5-x86_64": pe_ver => $name, release => '5', arch => 'x86_64', mock_root => $mock_root, }
View
2 manifests/packages/essential.pp
@@ -22,7 +22,7 @@
]
package { $builder_pkgs:
- ensure => installed,
+ ensure => installed,
}
case $operatingsystem {
View
13 manifests/packages/extra.pp
@@ -1,13 +0,0 @@
-class rpmbuilder::packages::extra {
-
- $builder_pkgs = [
- 'mlocate',
- 'nfs-utils',
- 's3cmd',
- 'rubygem-pg'
- ]
- package { $builder_pkgs:
- ensure => installed,
- require => Class['epel'],
- }
-}
View
18 spec/classes/packages_extra_spec.rb
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'rpmbuilder::packages::extra', :type => 'class' do
-
- context "Packages which should be installed" do
-
- packages = [
- 'mlocate',
- 'nfs-utils',
- 's3cmd',
- 'rubygem-pg',
- ]
-
- packages.each do|pkg|
- it { should contain_package(pkg).with_ensure('installed').with_require('Class[Rpmbuilder::Repos]') }
- end
- end
-end
View
1 spec/classes/rpmbuilder_spec.rb
@@ -55,7 +55,6 @@
it do
if param_hash[:pe]
- should contain_Rpmbuilder__Packages__Extra
should contain_Rpmbuilder__Mock__Pe_mocks.with({
:pe_vers => param_hash[:pe_vers],
:mock_root => param_hash[:mock_root],

0 comments on commit 6a41f5b

Please sign in to comment.