[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: fix puppetmaster-passenger package in puppetmaster::...

2017-11-13 Thread Herron (Code Review) 
Herron has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391067 )

Change subject: puppet: fix puppetmaster-passenger package in 
puppetmaster::passenger
..


puppet: fix puppetmaster-passenger package in puppetmaster::passenger

Bug: T177254
Change-Id: I08453f25456e825b7fcff021d8cf676b443d18f4
---
M modules/puppetmaster/manifests/passenger.pp
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Herron: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/puppetmaster/manifests/passenger.pp 
b/modules/puppetmaster/manifests/passenger.pp
index 5fce63c..7939674 100644
--- a/modules/puppetmaster/manifests/passenger.pp
+++ b/modules/puppetmaster/manifests/passenger.pp
@@ -22,10 +22,6 @@
 ) {
 include ::apache::mod::passenger
 
-package { 'puppetmaster-passenger':
-ensure => present,
-}
-
 # jessie-specific instructions
 if os_version('debian >= jessie') {
 # Debian jessie needs the DH params file
@@ -76,6 +72,10 @@
 default => 'puppetmaster-common',
 }
 
+package { $puppetmaster_passenger_package_name:
+ensure => present,
+}
+
 # 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.

-- 
To view, visit https://gerrit.wikimedia.org/r/391067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I08453f25456e825b7fcff021d8cf676b443d18f4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron 
Gerrit-Reviewer: Herron 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: fix puppetmaster-passenger package in puppetmaster::...

2017-11-13 Thread Herron (Code Review) 
Herron has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391067 )

Change subject: puppet: fix puppetmaster-passenger package in 
puppetmaster::passenger
..

puppet: fix puppetmaster-passenger package in puppetmaster::passenger

Bug: T177254
Change-Id: I08453f25456e825b7fcff021d8cf676b443d18f4
---
M modules/puppetmaster/manifests/passenger.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/391067/1

diff --git a/modules/puppetmaster/manifests/passenger.pp 
b/modules/puppetmaster/manifests/passenger.pp
index 5fce63c..7939674 100644
--- a/modules/puppetmaster/manifests/passenger.pp
+++ b/modules/puppetmaster/manifests/passenger.pp
@@ -22,10 +22,6 @@
 ) {
 include ::apache::mod::passenger
 
-package { 'puppetmaster-passenger':
-ensure => present,
-}
-
 # jessie-specific instructions
 if os_version('debian >= jessie') {
 # Debian jessie needs the DH params file
@@ -76,6 +72,10 @@
 default => 'puppetmaster-common',
 }
 
+package { $puppetmaster_passenger_package_name:
+ensure => present,
+}
+
 # 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.

-- 
To view, visit https://gerrit.wikimedia.org/r/391067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08453f25456e825b7fcff021d8cf676b443d18f4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits