Browse code

Merge "enable dns resolution from guests in neutron"

Jenkins authored on 2016/08/09 20:47:53
Showing 2 changed files
... ...
@@ -188,6 +188,9 @@ function configure_neutron_new {
188 188
         cp $NEUTRON_DIR/etc/dhcp_agent.ini.sample $NEUTRON_DHCP_CONF
189 189
 
190 190
         iniset $NEUTRON_DHCP_CONF DEFAULT debug True
191
+        # make it so we have working DNS from guests
192
+        iniset $NEUTRON_DHCP_CONF DEFAULT dnsmasq_local_resolv True
193
+
191 194
         iniset $NEUTRON_DHCP_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD"
192 195
         iniset $NEUTRON_DHCP_CONF DEFAULT interface_driver $NEUTRON_AGENT
193 196
         neutron_plugin_configure_dhcp_agent $NEUTRON_DHCP_CONF
... ...
@@ -779,6 +779,8 @@ function _configure_neutron_dhcp_agent {
779 779
     cp $NEUTRON_DIR/etc/dhcp_agent.ini.sample $Q_DHCP_CONF_FILE
780 780
 
781 781
     iniset $Q_DHCP_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
782
+    # make it so we have working DNS from guests
783
+    iniset $Q_DHCP_CONF_FILE DEFAULT dnsmasq_local_resolv True
782 784
     iniset $Q_DHCP_CONF_FILE AGENT root_helper "$Q_RR_COMMAND"
783 785
     if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then
784 786
         iniset $Q_DHCP_CONF_FILE AGENT root_helper_daemon "$Q_RR_DAEMON_COMMAND"