[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: only run rabbitmq cleanup on active control node

2018-01-02 Thread Rush (Code Review) 
Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398900 )

Change subject: openstack: only run rabbitmq cleanup on active control node
..


openstack: only run rabbitmq cleanup on active control node

Bug: T183144
Change-Id: I861913e384d7c9677d3346a77267f2526795111b
---
M modules/profile/manifests/openstack/base/rabbitmq.pp
A modules/rabbitmq/manifests/cleanup.pp
M modules/rabbitmq/manifests/init.pp
3 files changed, 41 insertions(+), 14 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, but someone else must approve
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/profile/manifests/openstack/base/rabbitmq.pp 
b/modules/profile/manifests/openstack/base/rabbitmq.pp
index ecb48ed..efd0127 100644
--- a/modules/profile/manifests/openstack/base/rabbitmq.pp
+++ b/modules/profile/manifests/openstack/base/rabbitmq.pp
@@ -15,6 +15,11 @@
 }
 contain '::rabbitmq'
 
+class {'::rabbitmq::cleanup':
+enabled => $::fqdn == $nova_controller,
+}
+contain '::rabbitmq::cleanup'
+
 class { '::rabbitmq::monitor':
 rabbit_monitor_username => $monitor_user,
 rabbit_monitor_password => $monitor_password,
@@ -41,14 +46,5 @@
 ferm::rule{'beam_nova':
 ensure => 'present',
 rule   =>  "saddr ${labs_hosts_range} proto tcp dport (5672 56918) 
ACCEPT;",
-}
-
-# These logfiles will be rotated by an already-existing wildcard logrotate 
rule for rabbit
-cron {
-'drain and log rabbit notifications.error queue':
-ensure  => 'present',
-user=> 'root',
-minute  => '35',
-command => '/usr/local/sbin/drain_queue notifications.error >> 
/var/log/rabbitmq/notifications_error.log 2>&1',
 }
 }
diff --git a/modules/rabbitmq/manifests/cleanup.pp 
b/modules/rabbitmq/manifests/cleanup.pp
new file mode 100644
index 000..616f728
--- /dev/null
+++ b/modules/rabbitmq/manifests/cleanup.pp
@@ -0,0 +1,31 @@
+# Rabbit does a poor job of cleaning up queues
+# that are not being consumed and this becomes costly
+# over time.
+
+class rabbitmq::cleanup(
+$enabled=false,
+) {
+
+if ($enabled) {
+$ensure = 'present'
+}
+else {
+$ensure = 'absent'
+}
+
+file { '/usr/local/sbin/drain_queue':
+ensure => 'present',
+owner  => 'root',
+group  => 'root',
+mode   => '0655',
+source => 'puppet:///modules/rabbitmq/drain_queue',
+}
+
+# These logfiles will be rotated by an already-existing wildcard logrotate 
rule for rabbit
+cron { 'drain and log rabbit notifications.error queue':
+ensure  => $ensure,
+user=> 'root',
+minute  => '35',
+command => '/usr/local/sbin/drain_queue notifications.error >> 
/var/log/rabbitmq/notifications_error.log 2>&1',
+}
+}
diff --git a/modules/rabbitmq/manifests/init.pp 
b/modules/rabbitmq/manifests/init.pp
index f102954..3e905ff 100644
--- a/modules/rabbitmq/manifests/init.pp
+++ b/modules/rabbitmq/manifests/init.pp
@@ -53,11 +53,6 @@
 require => Package['rabbitmq-server'],
 }
 
-service { 'rabbitmq-server':
-ensure  => $running,
-require => Package['rabbitmq-server'],
-}
-
 file { '/usr/local/sbin/drain_queue':
 ensure => 'present',
 owner  => 'root',
@@ -65,4 +60,9 @@
 mode   => '0655',
 source => 'puppet:///modules/rabbitmq/drain_queue',
 }
+
+service { 'rabbitmq-server':
+ensure  => $running,
+require => Package['rabbitmq-server'],
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I861913e384d7c9677d3346a77267f2526795111b
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Rush 
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]: openstack: only run rabbitmq cleanup on active control node

2017-12-18 Thread Rush (Code Review) 
Rush has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398900 )

Change subject: openstack: only run rabbitmq cleanup on active control node
..

openstack: only run rabbitmq cleanup on active control node

Bug: T183144
Change-Id: I861913e384d7c9677d3346a77267f2526795111b
---
M modules/profile/manifests/openstack/base/rabbitmq.pp
A modules/rabbitmq/manifests/cleanup.pp
M modules/rabbitmq/manifests/init.pp
3 files changed, 42 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/398900/1

diff --git a/modules/profile/manifests/openstack/base/rabbitmq.pp 
b/modules/profile/manifests/openstack/base/rabbitmq.pp
index ecb48ed..f7e1360 100644
--- a/modules/profile/manifests/openstack/base/rabbitmq.pp
+++ b/modules/profile/manifests/openstack/base/rabbitmq.pp
@@ -15,6 +15,11 @@
 }
 contain '::rabbitmq'
 
+class {'::rabbitmq::cleanup':
+   enabled => $::fqdn == $nova_controller,
+}
+contain '::rabbitmq::cleanup'
+
 class { '::rabbitmq::monitor':
 rabbit_monitor_username => $monitor_user,
 rabbit_monitor_password => $monitor_password,
@@ -41,14 +46,5 @@
 ferm::rule{'beam_nova':
 ensure => 'present',
 rule   =>  "saddr ${labs_hosts_range} proto tcp dport (5672 56918) 
ACCEPT;",
-}
-
-# These logfiles will be rotated by an already-existing wildcard logrotate 
rule for rabbit
-cron {
-'drain and log rabbit notifications.error queue':
-ensure  => 'present',
-user=> 'root',
-minute  => '35',
-command => '/usr/local/sbin/drain_queue notifications.error >> 
/var/log/rabbitmq/notifications_error.log 2>&1',
 }
 }
diff --git a/modules/rabbitmq/manifests/cleanup.pp 
b/modules/rabbitmq/manifests/cleanup.pp
new file mode 100644
index 000..227cb7c
--- /dev/null
+++ b/modules/rabbitmq/manifests/cleanup.pp
@@ -0,0 +1,32 @@
+# Rabbit does a poor job of cleaning up queues
+# that are not being consumed and this becomes costly
+# over time.
+
+class rabbitmq::cleanup(
+$enabled=false,
+) {
+
+if ($enabled) {
+$ensure = 'present'
+}
+else {
+$ensure = 'absent'
+}
+
+file { '/usr/local/sbin/drain_queue':
+ensure => 'present',
+owner  => 'root',
+group  => 'root',
+mode   => '0655',
+source => 'puppet:///modules/rabbitmq/drain_queue',
+}
+
+# These logfiles will be rotated by an already-existing wildcard logrotate 
rule for rabbit
+cron {
+'drain and log rabbit notifications.error queue':
+ensure  => $ensure,
+user=> 'root',
+minute  => '35',
+command => '/usr/local/sbin/drain_queue notifications.error >> 
/var/log/rabbitmq/notifications_error.l$
+}
+}
diff --git a/modules/rabbitmq/manifests/init.pp 
b/modules/rabbitmq/manifests/init.pp
index f102954..3e905ff 100644
--- a/modules/rabbitmq/manifests/init.pp
+++ b/modules/rabbitmq/manifests/init.pp
@@ -53,11 +53,6 @@
 require => Package['rabbitmq-server'],
 }
 
-service { 'rabbitmq-server':
-ensure  => $running,
-require => Package['rabbitmq-server'],
-}
-
 file { '/usr/local/sbin/drain_queue':
 ensure => 'present',
 owner  => 'root',
@@ -65,4 +60,9 @@
 mode   => '0655',
 source => 'puppet:///modules/rabbitmq/drain_queue',
 }
+
+service { 'rabbitmq-server':
+ensure  => $running,
+require => Package['rabbitmq-server'],
+}
 }

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

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

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