From b0242bdfc82f00394418e868197510605fa0f925 Mon Sep 17 00:00:00 2001 From: Nolan Brubaker Date: Mon, 23 Feb 2015 17:13:13 -0500 Subject: [PATCH] Remove conflicting public_router_id option Removes the public_router_id option from tempest.conf, which results in RouterNotFound failures before the NetworkbasicOps tests can actually commence. Removing this option allows the tests to proceed. According to the tempest.conf.sample file, this should only ever be set when neutron's `allow_overlapping_ips` setting is False. (It is set to True currently in os-ansible-deployment). Closes-Bug: #1422936 Change-Id: I87b9102c15d44a1f8861e6e21c7fbd76b3e71600 --- playbooks/roles/os_tempest/tasks/tempest_resources.yml | 7 ------- playbooks/roles/os_tempest/templates/tempest.conf.j2 | 1 - 2 files changed, 8 deletions(-) diff --git a/playbooks/roles/os_tempest/tasks/tempest_resources.yml b/playbooks/roles/os_tempest/tasks/tempest_resources.yml index aa67c9b935..e9cbcd5bdd 100644 --- a/playbooks/roles/os_tempest/tasks/tempest_resources.yml +++ b/playbooks/roles/os_tempest/tasks/tempest_resources.yml @@ -212,13 +212,6 @@ tags: - tempest-setup -- name: Store neutron router id - set_fact: - tempest_neutron_router_id: "{{ neutron_routers.router.id }}" - tags: - - tempest-setup - - tempest-config - - name: Add private subnet to router neutron: command: add_router_interface diff --git a/playbooks/roles/os_tempest/templates/tempest.conf.j2 b/playbooks/roles/os_tempest/templates/tempest.conf.j2 index e5e03593fa..3d1b761af1 100644 --- a/playbooks/roles/os_tempest/templates/tempest.conf.j2 +++ b/playbooks/roles/os_tempest/templates/tempest.conf.j2 @@ -162,7 +162,6 @@ build_timeout = 300 catalog_type = network dns_servers = 8.8.8.8,8.8.4.4 endpoint_type = internalURL -public_router_id = {{ tempest_neutron_router_id }} public_network_id = {{ tempest_neutron_public_network_id }} tenant_network_cidr = {{ tempest_private_subnet_cidr }} tenant_networks_reachable = false