commit ef17013d40fa994505b9cfeb710be9962d5ec1ae
author Jenkins <jenkins@review.openstack.org> Sat Dec 08 12:14:56 2012 +0000
committer Gerrit Code Review <review@openstack.org> Sat Dec 08 12:14:56 2012 +0000
tree 75c0161b9f52b4010710a90262ab5096a735ee6b
parent 1f53bf061f889a22db4d138cd7ef46e4f42297b8
parent 65c0846e379ba629fcc389486057322d5e30b34a

Merge "Local variable cosmetic changes in lib/tempest"

stack.sh

diff --git a/stack.sh b/stack.sh
index cddb64e..b3e858f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1478,6 +1478,8 @@
         fi
     elif is_service_enabled n-net; then
         add_nova_opt "network_manager=nova.network.manager.$NET_MAN"
+        add_nova_opt "instance_dns_manager=nova.network.minidns.MiniDNS"
+        add_nova_opt "floating_ip_dns_manager=nova.network.minidns.MiniDNS"
         add_nova_opt "public_interface=$PUBLIC_INTERFACE"
         add_nova_opt "vlan_interface=$VLAN_INTERFACE"
         add_nova_opt "flat_network_bridge=$FLAT_NETWORK_BRIDGE"