Code Review
/
multicloud
/
framework.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Implements NBIs of multivimbroker
[multicloud/framework.git]
/
multivimbroker
/
multivimbroker
/
settings.py
diff --git
a/multivimbroker/multivimbroker/settings.py
b/multivimbroker/multivimbroker/settings.py
index
3741d2d
..
2cff49b
100644
(file)
--- a/
multivimbroker/multivimbroker/settings.py
+++ b/
multivimbroker/multivimbroker/settings.py
@@
-12,11
+12,6
@@
import os
import sys
import os
import sys
-import redisco
-
-from multivimbroker.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD
-from multivimbroker.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT
-
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@
-73,16
+68,11
@@
REST_FRAMEWORK = {
DATABASES = {
'default': {
DATABASES = {
'default': {
- 'ENGINE': 'django.db.backends.mysql',
- 'NAME': DB_NAME,
- 'HOST': DB_IP,
- 'PORT': DB_PORT,
- 'USER': DB_USER,
- 'PASSWORD': DB_PASSWD,
- },
+ 'ENGINE': 'django.db.backends.sqlite3',
+ 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+ }
}
}
-redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0)
# CACHE_BACKEND = 'redis_cache.cache://%s@%s:%s' % (REDIS_PASSWD, REDIS_HOST, REDIS_PORT)
TIME_ZONE = 'UTC'
# CACHE_BACKEND = 'redis_cache.cache://%s@%s:%s' % (REDIS_PASSWD, REDIS_HOST, REDIS_PORT)
TIME_ZONE = 'UTC'