diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2017-10-09 17:42:08 +0800 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2017-10-09 17:42:08 +0800 |
| commit | e487cd90e97edb6b085e03de93b169756b41b882 (patch) | |
| tree | 3fe7361eecaf8dfe94df867b25ebc9619b2accdc /ocata | |
| parent | 6c84979daf381be78a9af0c52730525da9383a94 (diff) | |
Fix bug in identity v2.0 proxy
Change-Id: I9e25a1b6438f602e38c13cc1282daa9b10118388
Issue-Id: MULTICLOUD-109
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'ocata')
| -rw-r--r-- | ocata/ocata/proxy/urls.py | 8 | ||||
| -rw-r--r-- | ocata/run.sh | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ocata/ocata/proxy/urls.py b/ocata/ocata/proxy/urls.py index 12777bf6..e59b2e06 100644 --- a/ocata/ocata/proxy/urls.py +++ b/ocata/ocata/proxy/urls.py @@ -21,11 +21,13 @@ from ocata.proxy.views import services urlpatterns = [ # url(r'^identity/v2)$', # identityV2.Tokens.as_view()), - url(r'^identity/v3/auth/tokens$', + url(r'^identity/v3/auth/tokens/?$', identityV3.Tokens.as_view()), - url(r'^identity/v2.0/tokens$', + url(r'^identity/v2.0/?', identityV3.TokensV2.as_view()), - url(r'^identity/v2.0/tenants$', + url(r'^identity/v2.0/tokens/?$', + identityV3.TokensV2.as_view()), + url(r'^identity/v2.0/tenants/?$', services.GetTenants.as_view()), url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$', services.Services.as_view()), diff --git a/ocata/run.sh b/ocata/run.sh index 446172b4..cfb52b74 100644 --- a/ocata/run.sh +++ b/ocata/run.sh @@ -20,6 +20,14 @@ sed -i "s/AAI_SCHEMA_VERSION =.*/AAI_SCHEMA_VERSION = \"${AAI_SCHEMA_VERSION}\"/ sed -i "s/AAI_USERNAME =.*/AAI_USERNAME = \"${AAI_USERNAME}\"/g" ocata/pub/config/config.py sed -i "s/AAI_PASSWORD =.*/AAI_PASSWORD = \"${AAI_PASSWORD}\"/g" ocata/pub/config/config.py +sed -i "s/MSB_SERVICE_ADDR =.*/MSB_SERVICE_ADDR = \"${MSB_ADDR}\"/g" lib/newton/newton/pub/config/config.py +sed -i "s/MSB_SERVICE_PORT =.*/MSB_SERVICE_PORT = \"${MSB_PORT}\"/g" lib/newton/newton/pub/config/config.py +sed -i "s/AAI_ADDR =.*/AAI_ADDR = \"${AAI_ADDR}\"/g" lib/newton/newton/pub/config/config.py +sed -i "s/AAI_PORT =.*/AAI_PORT = \"${AAI_PORT}\"/g" lib/newton/newton/pub/config/config.py +sed -i "s/AAI_SCHEMA_VERSION =.*/AAI_SCHEMA_VERSION = \"${AAI_SCHEMA_VERSION}\"/g" lib/newton/newton/pub/config/config.py +sed -i "s/AAI_USERNAME =.*/AAI_USERNAME = \"${AAI_USERNAME}\"/g" lib/newton/newton/pub/config/config.py +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 nohup python manage.py runserver 0.0.0.0:9006 2>&1 & |