diff options
Diffstat (limited to 'ocata')
| -rw-r--r-- | ocata/assembly.xml | 14 | ||||
| -rw-r--r-- | ocata/ocata/proxy/views/services.py | 4 | ||||
| -rw-r--r-- | ocata/ocata/settings.py | 5 | ||||
| -rw-r--r-- | ocata/run.sh | 4 | ||||
| -rw-r--r-- | ocata/tox.ini | 2 |
5 files changed, 22 insertions, 7 deletions
diff --git a/ocata/assembly.xml b/ocata/assembly.xml index 7ae321af..e60dd7fd 100644 --- a/ocata/assembly.xml +++ b/ocata/assembly.xml @@ -1,5 +1,5 @@ <!-- - Copyright (c) 2017 Wind River Systems, Inc. + Copyright (c) 2017-2018 Wind River Systems, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -31,6 +31,18 @@ </includes> </fileSet> <fileSet> + <directory>../share</directory> + <outputDirectory>/lib/share</outputDirectory> + <includes> + <include>**/*.py</include> + <include>**/*.json</include> + <include>**/*.xml</include> + <include>**/*.wsdl</include> + <include>**/*.xsd</include> + <include>**/*.bpel</include> + </includes> + </fileSet> + <fileSet> <directory>logs</directory> <outputDirectory>/logs</outputDirectory> <includes> diff --git a/ocata/ocata/proxy/views/services.py b/ocata/ocata/proxy/views/services.py index 7eb6bd25..d65da20a 100644 --- a/ocata/ocata/proxy/views/services.py +++ b/ocata/ocata/proxy/views/services.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Wind River Systems, Inc. +# Copyright (c) 2017-2018 Wind River Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ import logging from rest_framework import status from ocata.pub.config import config -from newton.proxy.views import services as newton_services +from newton_base.proxy import services as newton_services logger = logging.getLogger(__name__) diff --git a/ocata/ocata/settings.py b/ocata/ocata/settings.py index 3cc4caa9..6021aa78 100644 --- a/ocata/ocata/settings.py +++ b/ocata/ocata/settings.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Wind River Systems, Inc. +# Copyright (c) 2017-2018 Wind River Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,6 +114,9 @@ CACHES = { } } +OPENSTACK_VERSION = "ocata" +MULTIVIM_VERSION = "multicloud-" + OPENSTACK_VERSION + if 'test' in sys.argv: from ocata.pub.config import config diff --git a/ocata/run.sh b/ocata/run.sh index cfb52b74..680290a2 100644 --- a/ocata/run.sh +++ b/ocata/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2017 Wind River Systems, Inc. +# Copyright (c) 2017-2018 Wind River Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ sed -i "s/AAI_USERNAME =.*/AAI_USERNAME = \"${AAI_USERNAME}\"/g" lib/newton/newt sed -i "s/AAI_PASSWORD =.*/AAI_PASSWORD = \"${AAI_PASSWORD}\"/g" lib/newton/newton/pub/config/config.py memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid -export PYTHONPATH=lib/newton +export PYTHONPATH=lib/newton:lib/share nohup python manage.py runserver 0.0.0.0:9006 2>&1 & while [ ! -f logs/runtime_ocata.log ]; do diff --git a/ocata/tox.ini b/ocata/tox.ini index dcd7033e..391f3b71 100644 --- a/ocata/tox.ini +++ b/ocata/tox.ini @@ -7,7 +7,7 @@ downloadcache = ~/cache/pip [testenv] setenv = - PYTHONPATH = {toxinidir}/../newton + PYTHONPATH = {toxinidir}/../newton:{toxinidir}/../share deps = -r{toxinidir}/requirements.txt commands = coverage run --branch manage.py test |