rebase: add password support to conn

Author: felliott

waterbutler/server/api/v1/provider/ratelimiting.py

@@ -19,7 +19,8 @@ def __init__(self):
 
         self.WINDOW_SIZE = settings.RATE_LIMITING_FIXED_WINDOW_SIZE
         self.WINDOW_LIMIT = settings.RATE_LIMITING_FIXED_WINDOW_LIMIT
-        self.redis_conn = Redis(host=settings.REDIS_DOMAIN, port=settings.REDIS_PORT)
+        self.redis_conn = Redis(host=settings.REDIS_DOMAIN, port=settings.REDIS_PORT,
+                                password=settings.REDIS_PASSWORD)
 
     def rate_limit(self):
         """ Check with the WB Redis server on whether to rate-limit a request.  Returns a tuple.

waterbutler/server/settings.py

@@ -36,6 +36,7 @@
 ENABLE_RATE_LIMITING = config.get_bool('ENABLE_RATE_LIMITING', False)
 REDIS_DOMAIN = config.get('REDIS_DOMAIN', '192.168.168.167')
 REDIS_PORT = config.get('REDIS_PORT', '6379')
+REDIS_PASSWORD = config.get('REDIS_PASSWORD', None)
 
 # Number of seconds until the redis key expires
 RATE_LIMITING_FIXED_WINDOW_SIZE = int(config.get('RATE_LIMITING_FIXED_WINDOW_SIZE', 3600))