Merge "Ensure DNS configuration from conf"
diff --git a/neutron_tempest_plugin/scenario/test_internal_dns.py b/neutron_tempest_plugin/scenario/test_internal_dns.py
index fadabb0..dfd42b0 100644
--- a/neutron_tempest_plugin/scenario/test_internal_dns.py
+++ b/neutron_tempest_plugin/scenario/test_internal_dns.py
@@ -35,7 +35,7 @@
           2.1) ping the other VM's internal IP
           2.2) ping the other VM's hostname
         """
-
+        self.skipTest('Disable whilst associated changes land into Neutron')
         network = self.create_network(dns_domain='starwars.')
         self.setup_network_and_server(network=network, server_name='luke')
         self.create_pingable_secgroup_rule(
@@ -72,7 +72,9 @@
             ssh_client, leia_port['fixed_ips'][0]['ip_address'],
             timeout=CONF.validation.ping_timeout * 10)
         self.assertIn(
-            'starwars', ssh_client.exec_command('cat /etc/resolv.conf'))
+            'openstackgate.local',
+            ssh_client.exec_command('cat /etc/resolv.conf')
+        )
 
         self.check_remote_connectivity(ssh_client, 'leia')
-        self.check_remote_connectivity(ssh_client, 'leia.starwars')
+        self.check_remote_connectivity(ssh_client, 'leia.openstackgate.local')