Herron has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391031 )
Change subject: puppet: fix puppetmaster and puppetmaster-common package names
......................................................................
puppet: fix puppetmaster and puppetmaster-common package names
debian puppetmaster packages have changed names with puppet 4. this
will use the new names when $puppet_major_version is 4.
Bug: T177254
Change-Id: Id4e6826eb00c442777cbb36931628f2c31d33110
---
M modules/puppetmaster/manifests/init.pp
1 file changed, 13 insertions(+), 2 deletions(-)
Approvals:
Herron: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index c0226de..078186c 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -78,10 +78,21 @@
require_package('puppetdb-terminus')
}
+ # puppetmaster package name changed to puppet-master with version 4
+ $puppetmaster_package_name = $puppet_major_version ? {
+ 4 => 'puppet-master',
+ default => 'puppetmaster',
+ }
+
+ # puppetmaster-common package name changed to puppet-master-common with
version 4
+ $puppetmaster_common_package_name = $puppet_major_version ? {
+ 4 => 'puppet-master-common',
+ default => 'puppetmaster-common',
+ }
package { [
- 'puppetmaster',
- 'puppetmaster-common',
+ $puppetmaster_package_name,
+ $puppetmaster_common_package_name,
'vim-puppet',
'puppet-el',
'rails',
--
To view, visit https://gerrit.wikimedia.org/r/391031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4e6826eb00c442777cbb36931628f2c31d33110
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron <kher...@wikimedia.org>
Gerrit-Reviewer: Herron <kher...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
