diff options
| author |   Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2018-09-22 16:28:07 +0000 |
|---|---|---|
| committer | Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2018-09-22 16:28:07 +0000 |
| commit | 280d4850a9ed44721b25c0978a48a02072a1527c (patch) | |
| tree | 3e86be55e14b102266e948ac984b7331663b9d70 | |
| parent | 050812c9ae2b85348b2ff29d4fa3e2ac2fb4fec7 (diff) | |
Fix unregistry issue
Change-Id: Ia4ddb6f11bf562a046d9f567fd7458b466c8642f
Issue-ID: MULTICLOUD-361
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
| -rwxr-xr-x | ocata/run.sh | 2 | ||||
| -rw-r--r-- | share/newton_base/registration/registration.py | 7 | ||||
| -rw-r--r-- | windriver/run.sh | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/ocata/run.sh b/ocata/run.sh index 541eaf10..ecca9860 100755 --- a/ocata/run.sh +++ b/ocata/run.sh @@ -18,6 +18,6 @@ export PYTHONPATH=lib/share service rabbitmq-server restart # make sure only 1 worker due to missing the synchronization between workers now -nohup celery -A ocata worker --concurrency=1 --loglevel=debug & +nohup celery -A ocata worker --concurrency=1 --loglevel=info & uwsgi --http :9006 --module ocata.wsgi --master --processes 4 diff --git a/share/newton_base/registration/registration.py b/share/newton_base/registration/registration.py index 84f40d71..fd2cf9aa 100644 --- a/share/newton_base/registration/registration.py +++ b/share/newton_base/registration/registration.py @@ -51,7 +51,7 @@ class Registry(APIView): service['region_name'] = viminfo['openstack_region_id']\ if viminfo.get('openstack_region_id') else viminfo['cloud_region_id'] - self._logger.info("making request with URI:%s" % resource_url) + self._logger.info("making request with URI:%s,%s" % (resource_url,service)) resp = session.get(resource_url, endpoint_filter=service) self._logger.info("request returns with status %s" % resp.status_code) if resp.status_code == status.HTTP_200_OK: @@ -1034,7 +1034,7 @@ class Registry(APIView): # remove all vservers try: # get list of vservers - vservers = tenant['vservers']['vserver'] + vservers = tenant.get('vservers', {}).get('vserver', []) for vserver in vservers: try: # iterate vport, except will be raised if no l-interface exist @@ -1058,8 +1058,7 @@ class Registry(APIView): except Exception: self._logger.error(traceback.format_exc()) - return None - pass + pass resource_url = ("/cloud-infrastructure/cloud-regions/" "cloud-region/%(cloud_owner)s/%(cloud_region_id)s/" diff --git a/windriver/run.sh b/windriver/run.sh index 8729584e..5f185bdf 100644 --- a/windriver/run.sh +++ b/windriver/run.sh @@ -18,7 +18,7 @@ export PYTHONPATH=lib/share service rabbitmq-server restart # make sure only 1 worker due to missing the synchronization between workers now -nohup celery -A titanium_cloud worker --concurrency=1 --loglevel=debug & +nohup celery -A titanium_cloud worker --concurrency=1 --loglevel=info & #nohup python manage.py runserver 0.0.0.0:9005 2>&1 & nohup uwsgi --http :9005 --module titanium_cloud.wsgi --master --processes 4 & |