openstack
/
nova
Code Issues Proposed changes

Merge "Only setup iptables for metadata if using nova-net"

This commit is contained in:
Jenkins 2017-07-20 12:30:11 +00:00 committed by Gerrit Code Review
parent 06a121b1e9 b7cb3b7523
commit e45accc5fd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/api/manager.py
View File

@ -16,6 +16,7 @@
from nova import manager
from nova.network import driver
from nova import utils
class MetadataManager(manager.Manager):
@ -26,5 +27,10 @@ class MetadataManager(manager.Manager):
"""
def __init__(self, *args, **kwargs):
super(MetadataManager, self).__init__(*args, **kwargs)
self.network_driver = driver.load_network_driver()
self.network_driver.metadata_accept()
if not utils.is_neutron():
# NOTE(mikal): we only add iptables rules if we're running
# under nova-network. This code should go away when the
# deprecation of nova-network is complete.
self.network_driver = driver.load_network_driver()
self.network_driver.metadata_accept()