x/python-ganttclient
Code Issues Proposed changes

Removed references to FLAGS.floating_ip_dns_domains.

Browse Source 
Now the availabable floating_ip_dns zones can be modified
dynamically, and determined from the DNS driver and nova database.

Change-Id: I0e02858e95085c868e8891f8f21d204472c46d33
This commit is contained in:
Andrew Bogott
2012-01-18 18:13:47 -06:00
parent 9427ccd90e
commit 6f297c3b7e
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/flags.py
View File

@@ -375,9 +375,6 @@ DEFINE_string('instance_dns_domain', '',
DEFINE_string('floating_ip_dns_manager', DEFINE_string('floating_ip_dns_manager',
'nova.network.dns_driver.DNSDriver', 'nova.network.dns_driver.DNSDriver',
'DNS Manager for floating IPs') 'DNS Manager for floating IPs')
DEFINE_multistring('floating_ip_dns_zones', '',
'DNS zones for floating IPs.'
'e.g. "example.org"')
DEFINE_string('network_manager', 'nova.network.manager.VlanManager', DEFINE_string('network_manager', 'nova.network.manager.VlanManager',
'Manager for network') 'Manager for network')
DEFINE_string('volume_manager', 'nova.volume.manager.VolumeManager', DEFINE_string('volume_manager', 'nova.volume.manager.VolumeManager',

6
nova/tests/test_network.py
View File

@@ -1502,12 +1502,10 @@ class LdapDNSTestCase(test.TestCase):
self.driver.delete_domain(domain2) self.driver.delete_domain(domain2)
def test_ldap_dns_domains(self): def test_ldap_dns_domains(self):
flags.FLAGS.floating_ip_dns_domains = [domain1, domain2]
domains = self.driver.get_domains() domains = self.driver.get_domains()
self.assertEqual(len(domains), 2) self.assertEqual(len(domains), 2)
self.assertEqual(domains[0], domain1) self.assertIn(domain1, domains)
self.assertEqual(domains[1], domain2) self.assertIn(domain2, domains)
def test_ldap_dns_create_conflict(self): def test_ldap_dns_create_conflict(self):
address1 = "10.10.10.11" address1 = "10.10.10.11"