Dependency bugfix + Selecting puppet version #19

Closed
wants to merge 1 commit into
from

Projects

None yet

3 participants

@vStone
Contributor
vStone commented Nov 28, 2012
  • Fix dependency generate_ca and the config file
  • Added a parameter that allows overriding the puppet version to install. Defaults to present in puppet::params.
@GregSutcliffe GregSutcliffe commented on the diff Nov 28, 2012
manifests/server/install.pp
@@ -1,5 +1,5 @@
class puppet::server::install {
- package { $puppet::server::master_package: ensure => installed }
+ package { $puppet::server::master_package: ensure => $::puppet::server::version }
GregSutcliffe
GregSutcliffe Nov 28, 2012 Member

what OS's have you tested this on? I'm pretty sure I tried to do this on Debian and it blew up - because we're not also specifying the version of puppet-common, which leads to a conflict...

vStone
vStone Nov 28, 2012 Contributor

k, gonna test that first then and adjust if needed.

GregSutcliffe
GregSutcliffe Nov 28, 2012 Member

Actually, we can probably fix this by specifying $puppet::server::master_package as an array in the debian part of puppet params.pp...

Member

I like the headers. Can't test the version-of-puppet part on Debian, @domcleal / @skottler can you oblige?

Contributor
vStone commented Nov 28, 2012

Still needs testing.

Contributor
vStone commented Nov 28, 2012

Since I didn't have any time to actually test the puppet module (no puppetmaster on debian available) I tested the following snippit on my mailserver :)

$packages = ['puppetmaster-common', 'puppetmaster']
$version = '2.7.20-1puppetlabs1'
package {$packages: ensure => $version, }

Output

notice: /Stage[main]//Package[puppetmaster-common]/ensure: ensure changed 'purged' to '2.7.20-1puppetlabs1'
notice: /Stage[main]//Package[puppetmaster]/ensure: ensure changed 'purged' to '2.7.20-1puppetlabs1'
notice: Finished catalog run in 22.15 seconds

Looking good no?

Member

I can test this tomorrow

Member

Thanks @vStone! Would you mind splitting this pull request out into a few separate ones since there are a couple goals included right now?

@vStone vStone Allow specifying what puppet version to use. Defaults to "present".
This required including both puppet and puppet-common for debian. Same
for puppetmaster and puppetmaster-common.
e11e605
Contributor
vStone commented Nov 28, 2012

See split out pull requests. Referenced here for ... reference !

@vStone vStone closed this Nov 28, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment