Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154712
Change subject: graphite: Fix graphite-auth to work with trusty
......................................................................
graphite: Fix graphite-auth to work with trusty
Trusty ships with a newer version of Django where
setup_environ is deprecated.
Change-Id: I736934fde4a47d3d449cd76b56313aa603b85eff
---
M modules/graphite/files/graphite-auth
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/154712/1
diff --git a/modules/graphite/files/graphite-auth
b/modules/graphite/files/graphite-auth
index 9776eb1..8f1b0d3 100755
--- a/modules/graphite/files/graphite-auth
+++ b/modules/graphite/files/graphite-auth
@@ -11,11 +11,9 @@
import sys
import argparse
import socket
+import os
-import graphite.settings
-
-from django.core.management import setup_environ
-setup_environ(graphite.settings)
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'graphite.settings')
from django.contrib.auth.models import User
--
To view, visit https://gerrit.wikimedia.org/r/154712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I736934fde4a47d3d449cd76b56313aa603b85eff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
