Bug 1160561 - Consolidate rabbitmq prefs

Sets the default values (and now also those used by Vagrant) to the same
as those used by Travis, so we can avoid specifying different values all
over the place.

.travis.yml

@@ -14,11 +14,6 @@ env:
   global:
     - TREEHERDER_DATABASE_USER='root'
     - TREEHERDER_DATABASE_PASSWORD=''
-    - TREEHERDER_RABBITMQ_USER='guest'
-    - TREEHERDER_RABBITMQ_PASSWORD='guest'
-    - TREEHERDER_RABBITMQ_VHOST='/'
-    - TREEHERDER_RABBITMQ_HOST='127.0.0.1'
-    - TREEHERDER_RABBITMQ_PORT='5672'
 services:
   - rabbitmq
   - memcached

docker/etc/profile.d/treeherder.sh

@@ -18,8 +18,4 @@ export TREEHERDER_DATABASE_HOST='mysql'
 export TREEHERDER_MEMCACHED='memcached:11211'
 
 # link rabbitmq
-export TREEHERDER_RABBITMQ_USER='guest'
-export TREEHERDER_RABBITMQ_PASSWORD='guest'
-export TREEHERDER_RABBITMQ_VHOST='/'
 export TREEHERDER_RABBITMQ_HOST='rabbitmq'
-export TREEHERDER_RABBITMQ_PORT='5672'

puppet/manifests/vagrant.pp

@@ -24,11 +24,9 @@
 $DB_USER = "treeherder_user"
 $DB_PASS = "treeherder_pass"
 $DJANGO_SECRET_KEY = "5up3r53cr3t"
-$RABBITMQ_USER = 'rabbituser'
-$RABBITMQ_PASSWORD = 'rabbitpass'
-$RABBITMQ_VHOST = 'treeherder'
-$RABBITMQ_HOST = 'localhost'
-$RABBITMQ_PORT = '5672'
+$RABBITMQ_USER = 'guest'
+$RABBITMQ_PASSWORD = 'guest'
+$RABBITMQ_VHOST = '/'
 
 # We need to force output on_failure, since we're using Puppet 2.x which
 # does not have the fix for https://projects.puppetlabs.com/issues/10907
@@ -47,11 +45,6 @@
     content => "
 export TREEHERDER_DEBUG='1'
 export TREEHERDER_DJANGO_SECRET_KEY='${DJANGO_SECRET_KEY}'
-export TREEHERDER_RABBITMQ_USER='${RABBITMQ_USER}'
-export TREEHERDER_RABBITMQ_PASSWORD='${RABBITMQ_PASSWORD}'
-export TREEHERDER_RABBITMQ_VHOST='${RABBITMQ_VHOST}'
-export TREEHERDER_RABBITMQ_HOST='${RABBITMQ_HOST}'
-export TREEHERDER_RABBITMQ_PORT='${RABBITMQ_PORT}'
 "
 }
 

treeherder/settings/base.py

@@ -39,11 +39,11 @@
 DATA_CYCLE_INTERVAL = timedelta(days=30 * 4)
 OBJECTSTORE_CYCLE_INTERVAL = timedelta(days=1)
 
-RABBITMQ_USER = os.environ.get("TREEHERDER_RABBITMQ_USER", "")
-RABBITMQ_PASSWORD = os.environ.get("TREEHERDER_RABBITMQ_PASSWORD", "")
-RABBITMQ_VHOST = os.environ.get("TREEHERDER_RABBITMQ_VHOST", "")
-RABBITMQ_HOST = os.environ.get("TREEHERDER_RABBITMQ_HOST", "")
-RABBITMQ_PORT = os.environ.get("TREEHERDER_RABBITMQ_PORT", "")
+RABBITMQ_USER = os.environ.get("TREEHERDER_RABBITMQ_USER", "guest")
+RABBITMQ_PASSWORD = os.environ.get("TREEHERDER_RABBITMQ_PASSWORD", "guest")
+RABBITMQ_VHOST = os.environ.get("TREEHERDER_RABBITMQ_VHOST", "/")
+RABBITMQ_HOST = os.environ.get("TREEHERDER_RABBITMQ_HOST", "localhost")
+RABBITMQ_PORT = os.environ.get("TREEHERDER_RABBITMQ_PORT", "5672")
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = os.environ.get("TREEHERDER_DJANGO_SECRET_KEY", "my-secret-key")