Merge "get_action_list: use novaclient.client.Client"

This commit is contained in:
Jenkins 2015-09-15 08:36:01 +00:00 committed by Gerrit Code Review
commit e642134fcf

View File

@ -26,7 +26,7 @@ from heatclient.v1 import client as heatclient
from keystoneclient import base as keystone_base from keystoneclient import base as keystone_base
from keystoneclient.v3 import client as keystoneclient from keystoneclient.v3 import client as keystoneclient
from novaclient.openstack.common.apiclient import base as nova_base from novaclient.openstack.common.apiclient import base as nova_base
from novaclient.v2 import client as novaclient from novaclient import client as novaclient
# TODO(nmakhotkin): Find a rational way to do it for neutron. # TODO(nmakhotkin): Find a rational way to do it for neutron.
@ -105,7 +105,7 @@ GLANCE_NAMESPACE_LIST = [
def get_nova_client(**kwargs): def get_nova_client(**kwargs):
return novaclient.Client() return novaclient.Client(2)
def get_keystone_client(**kwargs): def get_keystone_client(**kwargs):