openstack/openstack-ansible
Code Issues Proposed changes

Merge "Remove conflicting public_router_id option"

Browse Source
This commit is contained in:
Jenkins 2015-02-24 11:40:27 +00:00 committed by Gerrit Code Review
commit 39be48ff88
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:
- 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

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

@ -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