diff --git a/novaproxy/nova/compute/clients.py b/novaproxy/nova/compute/clients.py index 143a06d..674411a 100644 --- a/novaproxy/nova/compute/clients.py +++ b/novaproxy/nova/compute/clients.py @@ -104,7 +104,7 @@ class OpenStackClients(object): 'service_type': service_type, 'username': con.username, 'api_key': con.password, - 'region_name':con.region_name, + 'region_name':con.region_name, 'extensions': extensions } if con.password is not None: diff --git a/novaproxy/nova/compute/manager_proxy.py b/novaproxy/nova/compute/manager_proxy.py index ad3b7c1..c851484 100644 --- a/novaproxy/nova/compute/manager_proxy.py +++ b/novaproxy/nova/compute/manager_proxy.py @@ -1109,6 +1109,7 @@ class ComputeManager(manager.Manager): limit=self.QUERY_PER_PAGE_LIMIT, marker=marker) except Client_Unauthorized: + openstack_clients = clients.OpenStackClients(req_context) self.sync_nova_client = openstack_clients.nova() LOG.debug(_('the token is timed out in sync_nova_client,' 'fetch a new token form keystone.')) diff --git a/novaproxy/nova/image/sync/drivers/filesystem.py b/novaproxy/nova/image/sync/drivers/filesystem.py index 0421bc6..5e04735 100644 --- a/novaproxy/nova/image/sync/drivers/filesystem.py +++ b/novaproxy/nova/image/sync/drivers/filesystem.py @@ -59,7 +59,7 @@ class Store(object): from_store_loc['login_user'], from_store_loc['login_password']) except Exception: - msg = _('ssh login failed to %(user):%(passwd)@%(host)', + msg = _('ssh login failed to %(user)s:%(passwd)s %(host)s' % {'user': from_store_loc['login_user'], 'passwd': from_store_loc['login_password'], 'host': from_store_loc['host']