diff options
| -rw-r--r-- | ocata/ocata/settings.py | 11 | ||||
| -rw-r--r-- | ocata/run.sh | 8 | ||||
| -rw-r--r-- | share/newton_base/util.py | 2 | ||||
| -rw-r--r-- | windriver/run.sh | 8 | ||||
| -rw-r--r-- | windriver/titanium_cloud/settings.py | 11 |
5 files changed, 31 insertions, 9 deletions
diff --git a/ocata/ocata/settings.py b/ocata/ocata/settings.py index efb0296e..9f5711d6 100644 --- a/ocata/ocata/settings.py +++ b/ocata/ocata/settings.py @@ -91,7 +91,7 @@ LOGGING = { 'ocata_handler': { 'level': 'DEBUG', 'class': 'logging.handlers.RotatingFileHandler', - 'filename': os.path.join(BASE_DIR, 'logs/runtime_ocata.log'), + 'filename': '/var/log/onap/multicloud/openstack/ocata/ocata.log', 'formatter': 'standard', 'maxBytes': 1024 * 1024 * 50, 'backupCount': 5, @@ -104,7 +104,12 @@ LOGGING = { 'level': 'DEBUG', 'propagate': False }, - 'newton': { + 'newton_base': { + 'handlers': ['ocata_handler'], + 'level': 'DEBUG', + 'propagate': False + }, + 'common': { 'handlers': ['ocata_handler'], 'level': 'DEBUG', 'propagate': False @@ -147,6 +152,8 @@ MULTIVIM_VERSION = "multicloud-" + OPENSTACK_VERSION if 'test' in sys.argv: + LOGGING['handlers']['ocata_handler']['filename'] = 'logs/ocata.log' + REST_FRAMEWORK = {} import platform diff --git a/ocata/run.sh b/ocata/run.sh index a4edae47..f1bcfa9a 100644 --- a/ocata/run.sh +++ b/ocata/run.sh @@ -17,9 +17,13 @@ memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid export PYTHONPATH=lib/share nohup python manage.py runserver 0.0.0.0:9006 2>&1 & -while [ ! -f logs/runtime_ocata.log ]; do +logDir="/var/log/onap/multicloud/openstack/ocata" +if [ ! -x $logDir ]; then + mkdir -p $logDir +fi +while [ ! -f $logDir/ocata.log ]; do sleep 1 done -tail -F logs/runtime_ocata.log +tail -F $logDir/ocata.log diff --git a/share/newton_base/util.py b/share/newton_base/util.py index c708e850..36c47620 100644 --- a/share/newton_base/util.py +++ b/share/newton_base/util.py @@ -90,7 +90,7 @@ class VimDriverUtils(object): if auth_state: auth.set_auth_state(auth_state) - return session.Session(auth=auth) + return session.Session(auth=auth, verify=False) @staticmethod def get_auth_state(session_obj): diff --git a/windriver/run.sh b/windriver/run.sh index 6efd9b3a..05413d26 100644 --- a/windriver/run.sh +++ b/windriver/run.sh @@ -17,10 +17,14 @@ memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid export PYTHONPATH=lib/share nohup python manage.py runserver 0.0.0.0:9005 2>&1 & -while [ ! -f logs/runtime_titanium_cloud.log ]; do +logDir="/var/log/onap/multicloud/openstack/windriver" +if [ ! -x $logDir ]; then + mkdir -p $logDir +fi +while [ ! -f $logDir/titanium_cloud.log ]; do sleep 1 done -tail -F logs/runtime_titanium_cloud.log +tail -F $logDir/titanium_cloud.log diff --git a/windriver/titanium_cloud/settings.py b/windriver/titanium_cloud/settings.py index c8e39518..31900687 100644 --- a/windriver/titanium_cloud/settings.py +++ b/windriver/titanium_cloud/settings.py @@ -91,7 +91,7 @@ LOGGING = { 'titanium_cloud_handler': { 'level': 'DEBUG', 'class': 'logging.handlers.RotatingFileHandler', - 'filename': os.path.join(BASE_DIR, 'logs/runtime_titanium_cloud.log'), + 'filename': '/var/log/onap/multicloud/openstack/windriver/titanium_cloud.log', 'formatter': 'standard', 'maxBytes': 1024 * 1024 * 50, 'backupCount': 5, @@ -104,7 +104,12 @@ LOGGING = { 'level': 'DEBUG', 'propagate': False }, - 'newton': { + 'newton_base': { + 'handlers': ['titanium_cloud_handler'], + 'level': 'DEBUG', + 'propagate': False + }, + 'common': { 'handlers': ['titanium_cloud_handler'], 'level': 'DEBUG', 'propagate': False @@ -147,6 +152,8 @@ MULTIVIM_VERSION = "multicloud-" + OPENSTACK_VERSION if 'test' in sys.argv: + LOGGING['handlers']['titanium_cloud_handler']['filename'] = 'logs/titanium_cloud.log' + REST_FRAMEWORK = {} import platform |