summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2016-12-13 05:47:24 -0800
committerToshio Kuratomi <a.badger@gmail.com>2016-12-13 05:57:46 -0800
commit3beac898931f8d235fd90182ea40a381c23cedba (patch)
tree1a1931eb13e516e93df5c3fdc62baa3abce88f15
parentabc0eeac024e4f9448de133135f1bbda3ef1a5b8 (diff)
downloadansible-3beac898931f8d235fd90182ea40a381c23cedba.tar.gz
Remove itervalues (not available on py3)
(cherry picked from 51491c990444be4153d8d4e07ced00f8af348ddd)
-rwxr-xr-xcontrib/inventory/nova.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/inventory/nova.py b/contrib/inventory/nova.py
index fc1b656e32..f8c1617735 100755
--- a/contrib/inventory/nova.py
+++ b/contrib/inventory/nova.py
@@ -26,7 +26,7 @@ import re
import os
import ConfigParser
from novaclient import client as nova_client
-from six import iteritems
+from six import iteritems, itervalues
try:
import json
@@ -105,7 +105,7 @@ def get_ips(server, access_ip=True):
# Iterate through each servers network(s), get addresses and get type
addresses = getattr(server, 'addresses', {})
if len(addresses) > 0:
- for network in addresses.itervalues():
+ for network in itervalues(addresses):
for address in network:
if address.get('OS-EXT-IPS:type', False) == 'fixed':
private.append(address['addr'])