Merge pull request #6400 from vadimkuznetsov/bug5959

bug 5959: https://github.com/ansible/ansible/issues/5959
This commit is contained in:
Michael DeHaan 2014-03-11 15:08:29 -05:00
commit 25a14461b0

View file

@ -18,7 +18,7 @@
# along with this software. If not, see <http://www.gnu.org/licenses/>. # along with this software. If not, see <http://www.gnu.org/licenses/>.
try: try:
from novaclient.v1_1 import client from novaclient.v1_1 import client as nova_client
from novaclient import exceptions from novaclient import exceptions
import time import time
except ImportError: except ImportError: