diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-10 00:50:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-10 00:50:50 +0000 |
| commit | bd2d89dd567dc8544201042487ac23c2096a4b8d (patch) | |
| tree | 81b064e9c52a1ec45d84217faeeecfb2c873dab4 /nova/virt | |
| parent | 88b5e07717352d9ae7149a9d2cc6b56539991f31 (diff) | |
| parent | c919ba6602d3e99b23f133b68ec3a484aca3c78d (diff) | |
Merge "Since 'net' is of nova.network.model.VIF class and 'ips' is an empty list, net needs to be pulled from hydrated nw_info.fixed_ips(), and appended to ips."
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/firewall.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py index 9df036412..3ae12bcb0 100644 --- a/nova/virt/firewall.py +++ b/nova/virt/firewall.py @@ -327,15 +327,16 @@ class IptablesFirewallDriver(FirewallDriver): nw_api = nova.network.API() for instance in rule['grantee_group']['instances']: LOG.info('instance: %r', instance) - ips = [] nw_info = nw_api.get_instance_nw_info(ctxt, instance) - for net in nw_info: - ips.extend(net[1]['ips']) + + ips = [ip['address'] + for ip in nw_info.fixed_ips() + if ip['version'] == version] LOG.info('ips: %r', ips) for ip in ips: - subrule = args + ['-s %s' % ip['ip']] + subrule = args + ['-s %s' % ip] fw_rules += [' '.join(subrule)] LOG.info('Using fw_rules: %r', fw_rules) |