summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-12-19 20:22:00 +0000
committerGerrit Code Review <review@openstack.org>2011-12-19 20:22:00 +0000
commit90668f8564e65f95a681baee847a384e484c46d8 (patch)
tree6edb5a1ba41f1471f3f494797eb3d4041cfc6980 /nova
parent30731e7d60077b3411e1953b46a1a39ce4ca16b8 (diff)
parentfcdfdb16543559f06d2fc5653795edf15bd015e4 (diff)
Merge "Renamed the instance_dns_driver to dns_driver for more general use."
Diffstat (limited to 'nova')
-rw-r--r--nova/flags.py2
-rw-r--r--nova/network/dns_driver.py (renamed from nova/network/instance_dns_driver.py)6
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 63534af96..599dcb0f7 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -366,7 +366,7 @@ DEFINE_string('compute_manager', 'nova.compute.manager.ComputeManager',
DEFINE_string('console_manager', 'nova.console.manager.ConsoleProxyManager',
'Manager for console proxy')
DEFINE_string('instance_dns_manager',
- 'nova.network.instance_dns_driver.InstanceDNSManagerDriver',
+ 'nova.network.dns_driver.DNSDriver',
'DNS Manager for instance IPs')
DEFINE_string('instance_dns_zone', '',
'DNS Zone for instance IPs')
diff --git a/nova/network/instance_dns_driver.py b/nova/network/dns_driver.py
index c0c6af893..68f5255e4 100644
--- a/nova/network/instance_dns_driver.py
+++ b/nova/network/dns_driver.py
@@ -13,14 +13,14 @@
# under the License.
-class InstanceDNSManagerDriver(object):
- """ Defines the instance DNS interface. Does nothing. """
+class DNSDriver(object):
+ """ Defines the DNS manager interface. Does nothing. """
def __init__(self):
pass
def get_zones(self):
- pass
+ return []
def create_entry(self, _name, _address, _type, _dnszone):
pass