Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/176190
Change subject: Revert "ocg: Temp hack to fix empty redis password, take 2" ...................................................................... Revert "ocg: Temp hack to fix empty redis password, take 2" Bah, https://gerrit.wikimedia.org/r/#/c/176181/ probably did work, I just didn't check properly. This reverts commit 8da2bc7b3c370a1afae90805b25104ccf44554e5. Change-Id: Ib787fcf87c6a11ef9d8870cd16c1434fb1e20ce0 --- M modules/ocg/manifests/init.pp 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/90/176190/1 diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp index 4f10f0b..871aeef 100644 --- a/modules/ocg/manifests/init.pp +++ b/modules/ocg/manifests/init.pp @@ -15,7 +15,7 @@ $service_port = 8000, $redis_host = 'localhost', $redis_port = 6379, - $redis_password = '', + $redis_password = $::passwords::redis::main_password, # HACK: Temp fix for https://phabricator.wikimedia.org/T76111 $statsd_host = 'localhost', $statsd_port = 8125, $statsd_is_txstatsd = 0, @@ -26,10 +26,6 @@ $postmortem_dir = '/srv/deployment/ocg/postmortem', $log_dir = '/srv/deployment/ocg/log' ) { - if $redis_password == '' { - # HACK: Temp fix for https://phabricator.wikimedia.org/T76111 - $redis_password = $::passwords::redis::main_password - } package { 'ocg/ocg': provider => 'trebuchet', } -- To view, visit https://gerrit.wikimedia.org/r/176190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib787fcf87c6a11ef9d8870cd16c1434fb1e20ce0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
