From a207fea389e4bfce62296f13cad0ef2556feb134 Mon Sep 17 00:00:00 2001 From: David Ames Date: Mon, 21 Oct 2019 16:06:52 -0700 Subject: [PATCH] Stop setting external DNS Use neutron DNS by not setting a DNS server on the subnet. Also correct TEST_NAME_SERVER for potential future use. --- zaza/openstack/configure/network.py | 4 ---- zaza/openstack/utilities/generic.py | 4 ++-- zaza/openstack/utilities/openstack.py | 8 +++++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/zaza/openstack/configure/network.py b/zaza/openstack/configure/network.py index 55bcdf3..409141c 100755 --- a/zaza/openstack/configure/network.py +++ b/zaza/openstack/configure/network.py @@ -172,10 +172,6 @@ def setup_sdn(network_config, keystone_session=None): network_config.get("private_net_cidr"), subnetpool=subnetpool, ip_version=ip_version) - openstack_utils.update_subnet_dns( - neutron_client, - project_subnet, - network_config["external_dns"]) openstack_utils.plug_subnet_into_router( neutron_client, network_config["router_name"], diff --git a/zaza/openstack/utilities/generic.py b/zaza/openstack/utilities/generic.py index e04ae34..7c66793 100644 --- a/zaza/openstack/utilities/generic.py +++ b/zaza/openstack/utilities/generic.py @@ -133,7 +133,7 @@ def get_undercloud_env_vars(): export NET_ID="a705dd0f-5571-4818-8c30-4132cc494668" export GATEWAY="172.17.107.1" export CIDR_EXT="172.17.107.0/24" - export NAMESERVER="10.5.0.2" + export NAME_SERVER="10.5.0.2" export FIP_RANGE="172.17.107.200:172.17.107.249" :returns: Network environment variables @@ -143,7 +143,7 @@ def get_undercloud_env_vars(): # Note: TEST_* is the only prefix honored _vars = {} _vars['net_id'] = os.environ.get('TEST_NET_ID') - _vars['external_dns'] = os.environ.get('TEST_NAMESERVER') + _vars['external_dns'] = os.environ.get('TEST_NAME_SERVER') _vars['default_gateway'] = os.environ.get('TEST_GATEWAY') _vars['external_net_cidr'] = os.environ.get('TEST_CIDR_EXT') diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py index 87b0934..f8ccd1b 100644 --- a/zaza/openstack/utilities/openstack.py +++ b/zaza/openstack/utilities/openstack.py @@ -2078,8 +2078,8 @@ def get_ports_from_device_id(neutron_client, device_id): return ports -@tenacity.retry(wait=tenacity.wait_exponential(multiplier=1, max=60), - reraise=True, stop=tenacity.stop_after_attempt(10)) +@tenacity.retry(wait=tenacity.wait_exponential(multiplier=1, max=120), + reraise=True, stop=tenacity.stop_after_attempt(12)) def cloud_init_complete(nova_client, vm_id, bootstring): """Wait for cloud init to complete on the given vm. @@ -2098,7 +2098,9 @@ def cloud_init_complete(nova_client, vm_id, bootstring): instance = nova_client.servers.find(id=vm_id) console_log = instance.get_console_output() if bootstring not in console_log: - raise exceptions.CloudInitIncomplete() + raise exceptions.CloudInitIncomplete( + "'{}' not found in console log: {}" + .format(bootstring, console_log)) @tenacity.retry(wait=tenacity.wait_exponential(multiplier=1, max=60),