Herron has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391060 )
Change subject: puppet: fix puppet package names in puppetmaster::passenger
......................................................................
puppet: fix puppet package names in puppetmaster::passenger
add conditional to use hyphenated puppet package names when
puppet_major_version 4 is selected.
Bug: T177254
Change-Id: I7f4c4d179593400c502c8caf63cee06d0a30045c
---
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/manifests/passenger.pp
2 files changed, 20 insertions(+), 7 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 078186c..37e1c22 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -110,12 +110,12 @@
}
class { '::puppetmaster::passenger':
- bind_address => $bind_address,
- verify_client => $verify_client,
- allow_from => $allow_from,
- deny_from => $deny_from,
+ bind_address => $bind_address,
+ verify_client => $verify_client,
+ allow_from => $allow_from,
+ deny_from => $deny_from,
+ puppet_major_version => $puppet_major_version,
}
-
$ssl_settings = ssl_ciphersuite('apache', 'compat')
diff --git a/modules/puppetmaster/manifests/passenger.pp
b/modules/puppetmaster/manifests/passenger.pp
index 053c5c8..5fce63c 100644
--- a/modules/puppetmaster/manifests/passenger.pp
+++ b/modules/puppetmaster/manifests/passenger.pp
@@ -18,6 +18,7 @@
$verify_client,
$allow_from,
$deny_from,
+ $puppet_major_version=undef,
) {
include ::apache::mod::passenger
@@ -63,6 +64,18 @@
require => File['/etc/apache2/sites-available/puppet-master.conf'],
}
+ # puppetmaster-passenger package name changed to puppet-master-passenger
with version 4
+ $puppetmaster_passenger_package_name = $puppet_major_version ? {
+ 4 => 'puppet-master-passenger',
+ default => 'puppetmaster-passenger',
+ }
+
+ # 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',
+ }
+
# Since we are running puppet via passenger, we need to ensure
# the puppetmaster service is stopped, since they use the same port
# and will conflict when both started.
@@ -80,8 +93,8 @@
mode => '0444',
source => 'puppet:///modules/puppetmaster/default',
require => [
- Package['puppetmaster-passenger'],
- Package['puppetmaster-common']
+ Package[ $puppetmaster_passenger_package_name ],
+ Package[ $puppetmaster_common_package_name ]
],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/391060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f4c4d179593400c502c8caf63cee06d0a30045c
Gerrit-PatchSet: 2
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
