Fix empty MONGODB_SERVERS issue

totem · Apr 20, 2016 · 243eb32 · 243eb32
1 parent 4126ad7
commit 243eb32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/bin/deployer-env.sh b/bin/deployer-env.sh
@@ -20,7 +20,6 @@ export AMQP_USERNAME="${AMQP_USERNAME:-guest}"
 export AMQP_PASSWORD="${AMQP_PASSWORD:-guest}"
 export MONGODB_USERNAME="${MONGODB_USERNAME:-}"
 export MONGODB_PASSWORD="${MONGODB_PASSWORD:-}"
-export MONGODB_SERVERS="${MONGODB_SERVERS:-}"
 export MONGODB_HOST="${MONGODB_HOST:-$HOST_IP}"
 export MONGODB_PORT="${MONGODB_PORT:-27017}"
 export MONGODB_DB="${MONGODB_DB}"

diff --git a/conf/appconfig.py b/conf/appconfig.py
@@ -279,8 +279,8 @@
 MONGODB_PASSWORD = os.getenv('MONGODB_PASSWORD', '')
 MONGODB_HOST = os.getenv('MONGODB_HOST', '127.0.0.1')
 MONGODB_PORT = int(os.getenv('MONGODB_PORT', '27017'))
-MONGODB_SERVERS = os.getenv('MONGODB_SERVERS', '{}:{}'.format(
-    MONGODB_HOST, MONGODB_PORT))
+MONGODB_SERVERS = os.getenv('MONGODB_SERVERS') \
+                  or '{}:{}'.format(MONGODB_HOST, MONGODB_PORT)
 MONGODB_DB = os.getenv('MONGODB_DB') or 'totem-{}'.format(TOTEM_ENV)
 MONGODB_AUTH_DB = os.getenv('MONGODB_AUTH_DB') or 'admin'
 MONGODB_AUTH = '{0}:{1}@'.format(MONGODB_USERNAME, MONGODB_PASSWORD) \