openstack/openstack-ansible
Code Issues Proposed changes

Remove conflicting public_router_id option

Browse Source 
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
This commit is contained in:
Nolan Brubaker 2015-02-23 17:13:13 -05:00
parent 6b7e47822b
commit b0242bdfc8
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/roles/os_tempest/tasks/tempest_resources.yml
View File

@ -212,13 +212,6 @@
tags: tags:
- tempest-setup - 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 - name: Add private subnet to router
neutron: neutron:
command: add_router_interface command: add_router_interface

1
playbooks/roles/os_tempest/templates/tempest.conf.j2
View File

@ -162,7 +162,6 @@ build_timeout = 300
catalog_type = network catalog_type = network
dns_servers = 8.8.8.8,8.8.4.4 dns_servers = 8.8.8.8,8.8.4.4
endpoint_type = internalURL endpoint_type = internalURL
public_router_id = {{ tempest_neutron_router_id }}
public_network_id = {{ tempest_neutron_public_network_id }} public_network_id = {{ tempest_neutron_public_network_id }}
tenant_network_cidr = {{ tempest_private_subnet_cidr }} tenant_network_cidr = {{ tempest_private_subnet_cidr }}
tenant_networks_reachable = false tenant_networks_reachable = false