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

Commit

Permalink
Change include to contain for better encapsulation
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven Critchfield committed Sep 6, 2016
1 parent eada53f commit 60e7917
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 44 deletions.
80 changes: 40 additions & 40 deletions manifests/defaults.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,56 +7,56 @@

$osver = split($::operatingsystemrelease, '[.]')

if 'epel' in $yum::extrarepo { include yum::repo::epel }
if 'rpmforge' in $yum::extrarepo { include yum::repo::rpmforge }
if 'jpackage5' in $yum::extrarepo { include yum::repo::jpackage5 }
if 'jpackage6' in $yum::extrarepo { include yum::repo::jpackage6 }
if 'remi' in $yum::extrarepo { include yum::repo::remi }
if 'remi_php55' in $yum::extrarepo { include yum::repo::remi_php55 }
if 'remi_php56' in $yum::extrarepo { include yum::repo::remi_php56 }
if 'remi_php70' in $yum::extrarepo { include yum::repo::remi_php70 }
if 'tmz' in $yum::extrarepo and $osver[0] != '4' { include yum::repo::tmz }
if 'webtatic' in $yum::extrarepo { include yum::repo::webtatic }
if 'puppetlabs' in $yum::extrarepo and $osver[0] != '4' { include yum::repo::puppetlabs }
if 'puppetdevel' in $yum::extrarepo and $osver[0] != '4' { include yum::repo::puppetdevel }
if 'puppetlabs_collections' in $yum::extrarepo { include yum::repo::puppetlabs_collections }
if 'nginx' in $yum::extrarepo and $osver[0] != '4' { include yum::repo::nginx }
if 'mongodb' in $yum::extrarepo and $osver[0] != '4' { include yum::repo::mongodb }
if 'repoforge' in $yum::extrarepo { include yum::repo::repoforge }
if 'repoforgeextras' in $yum::extrarepo { include yum::repo::repoforgeextras }
if 'integ_ganeti' in $yum::extrarepo { include yum::repo::integ_ganeti }
if 'elrepo' in $yum::extrarepo { include yum::repo::elrepo }
if 'newrelic' in $yum::extrarepo { include yum::repo::newrelic }
if 'mod_pagespeed' in $yum::extrarepo { include yum::repo::mod_pagespeed }
if 'jenkins' in $yum::extrarepo { include yum::repo::jenkins }
if 'centalt' in $yum::extrarepo { include yum::repo::centalt }
if 'elastix' in $yum::extrarepo { include yum::repo::elastix }
if 'mysql_community' in $yum::extrarepo { include yum::repo::mysql_community }
if 'dell_omsa' in $yum::extrarepo { include yum::repo::dell_omsa }
if 'docker' in $yum::extrarepo { include yum::repo::docker }
if 'epel' in $yum::extrarepo { contain yum::repo::epel }
if 'rpmforge' in $yum::extrarepo { contain yum::repo::rpmforge }
if 'jpackage5' in $yum::extrarepo { contain yum::repo::jpackage5 }
if 'jpackage6' in $yum::extrarepo { contain yum::repo::jpackage6 }
if 'remi' in $yum::extrarepo { contain yum::repo::remi }
if 'remi_php55' in $yum::extrarepo { contain yum::repo::remi_php55 }
if 'remi_php56' in $yum::extrarepo { contain yum::repo::remi_php56 }
if 'remi_php70' in $yum::extrarepo { contain yum::repo::remi_php70 }
if 'tmz' in $yum::extrarepo and $osver[0] != '4' { contain yum::repo::tmz }
if 'webtatic' in $yum::extrarepo { contain yum::repo::webtatic }
if 'puppetlabs' in $yum::extrarepo and $osver[0] != '4' { contain yum::repo::puppetlabs }
if 'puppetdevel' in $yum::extrarepo and $osver[0] != '4' { contain yum::repo::puppetdevel }
if 'puppetlabs_collections' in $yum::extrarepo { contain yum::repo::puppetlabs_collections }
if 'nginx' in $yum::extrarepo and $osver[0] != '4' { contain yum::repo::nginx }
if 'mongodb' in $yum::extrarepo and $osver[0] != '4' { contain yum::repo::mongodb }
if 'repoforge' in $yum::extrarepo { contain yum::repo::repoforge }
if 'repoforgeextras' in $yum::extrarepo { contain yum::repo::repoforgeextras }
if 'integ_ganeti' in $yum::extrarepo { contain yum::repo::integ_ganeti }
if 'elrepo' in $yum::extrarepo { contain yum::repo::elrepo }
if 'newrelic' in $yum::extrarepo { contain yum::repo::newrelic }
if 'mod_pagespeed' in $yum::extrarepo { contain yum::repo::mod_pagespeed }
if 'jenkins' in $yum::extrarepo { contain yum::repo::jenkins }
if 'centalt' in $yum::extrarepo { contain yum::repo::centalt }
if 'elastix' in $yum::extrarepo { contain yum::repo::elastix }
if 'mysql_community' in $yum::extrarepo { contain yum::repo::mysql_community }
if 'dell_omsa' in $yum::extrarepo { contain yum::repo::dell_omsa }
if 'docker' in $yum::extrarepo { contain yum::repo::docker }

if $yum::bool_defaultrepo {
case $::operatingsystem {
centos: {
if $osver[0] == '7' { include yum::repo::centos7 }
if $osver[0] == '6' { include yum::repo::centos6 }
if $osver[0] == '5' { include yum::repo::centos5 }
if $osver[0] == '4' { include yum::repo::centos4 }
if 'centos-testing' in $yum::extrarepo { include yum::repo::centos_testing }
if 'karan' in $yum::extrarepo { include yum::repo::karan }
if 'atomic' in $yum::extrarepo { include yum::repo::atomic }
if 'scl' in $yum::extrarepo { include yum::repo::scl }
if $osver[0] == '7' { contain yum::repo::centos7 }
if $osver[0] == '6' { contain yum::repo::centos6 }
if $osver[0] == '5' { contain yum::repo::centos5 }
if $osver[0] == '4' { contain yum::repo::centos4 }
if 'centos-testing' in $yum::extrarepo { contain yum::repo::centos_testing }
if 'karan' in $yum::extrarepo { contain yum::repo::karan }
if 'atomic' in $yum::extrarepo { contain yum::repo::atomic }
if 'scl' in $yum::extrarepo { contain yum::repo::scl }
}
redhat: {
}
scientific: {
if $osver[0] == '6' { include yum::repo::sl6 }
if $osver[0] == '5' { include yum::repo::sl5 }
if 'centos-testing' in $yum::extrarepo { include yum::repo::centos_testing }
if 'karan' in $yum::extrarepo { include yum::repo::karan }
if $osver[0] == '6' { contain yum::repo::sl6 }
if $osver[0] == '5' { contain yum::repo::sl5 }
if 'centos-testing' in $yum::extrarepo { contain yum::repo::centos_testing }
if 'karan' in $yum::extrarepo { contain yum::repo::karan }
}
xenserver: {
include yum::repo::xenserver
contain yum::repo::xenserver
}
default: { }
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
}

if $real_source_repo_dir == undef {
include yum::defaults
contain yum::defaults
}

# Yum Configuration file
Expand Down Expand Up @@ -350,12 +350,12 @@

### Manage Automatic Updates
if $yum::manage_updates {
include "::yum::${update}"
contain "::yum::${update}"
}

### Include custom class if $my_class is set
if $yum::my_class and $yum::my_class != '' {
include $yum::my_class
contain $yum::my_class
}


Expand Down
2 changes: 1 addition & 1 deletion manifests/managed_yumrepo.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
) {

# ensure that everything is setup
include yum::prerequisites
contain yum::prerequisites

if $protect != 'absent' {
if ! defined(Yum::Plugin['protectbase']) {
Expand Down

0 comments on commit 60e7917

Please sign in to comment.