Skip to content

Commit

Permalink
Update puppet to 97b41d9fdadbe98f965d515b55c35a65da596ef2
Browse files Browse the repository at this point in the history
97b41d9fdadbe98f965d515b55c35a65da596ef2 Include repo information for el7.
ef07056102dd3d0624dc2fec1c8cba7292289cb0 Remove missing package.
  • Loading branch information
xbezdick committed Mar 3, 2015
1 parent c798c83 commit a222c81
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ mod 'pacemaker',
:git => 'https://github.com/redhat-openstack/puppet-pacemaker.git'

mod 'puppet',
:commit => 'bd467cae15eba9ca44274034d2593b0eaf30518d',
:commit => '97b41d9fdadbe98f965d515b55c35a65da596ef2',
:git => 'https://github.com/purpleidea/puppet-puppet.git'

mod 'qpid',
Expand Down
9 changes: 5 additions & 4 deletions puppet/manifests/common.pp
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@
require => Package[$package_augeas],
}

package { 'ruby-rdoc': # provide 'RDoc::usage' for puppet help
ensure => present,
require => Package['puppet'], # install only if puppet is used
}
# TODO: is rubygem-rdoc equivalent ?
#package { 'ruby-rdoc': # provide 'RDoc::usage' for puppet help
# ensure => present,
# require => Package['puppet'], # install only if puppet is used
#}

# TODO: enable this if we ever use the gem provider...
# NOTE: for building closed systems, hopefully gem can install offline!
Expand Down
7 changes: 4 additions & 3 deletions puppet/manifests/params/repo/yum.pp
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@

class puppet::params::repo::yum {

$version = $operatingsystemrelease ? {
6.0 => '6',
$version = "${operatingsystemrelease}" ? {
'6.0' => '6',
#6.1 => '6.1',
#6.2 => '6.2',
#6.3 => '6.3',
#6.4 => '6.4',
6.5 => '6', # TODO: repo not released yet
'6.5' => '6',
'7.0.1406' => '7',
default => "${operatingsystemrelease}",
}

Expand Down

0 comments on commit a222c81

Please sign in to comment.