Merge "Allow public network name to be changed"

This commit is contained in:
Zuul 2018-04-13 22:56:45 +00:00 committed by Gerrit Code Review
commit 1d54d3f1e1
2 changed files with 2 additions and 2 deletions

View File

@ -232,7 +232,7 @@
endpoint_type: internal endpoint_type: internal
validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}" validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
name: router name: router
network: public network: "{{ tempest_public_net_name }}"
interfaces: interfaces:
- "{{ tempest_private_subnet_name }}" - "{{ tempest_private_subnet_name }}"
project: "{{ keystone_demo_tenant_id }}" project: "{{ keystone_demo_tenant_id }}"

View File

@ -92,7 +92,7 @@ project_network_cidr = {{ tempest_network_tenant_network_cidr }}
project_network_mask_bits = {{ tempest_network_tenant_network_mask_bits }} project_network_mask_bits = {{ tempest_network_tenant_network_mask_bits }}
project_networks_reachable = false project_networks_reachable = false
public_network_id = {{ tempest_neutron_public_network_id }} public_network_id = {{ tempest_neutron_public_network_id }}
floating_network_name = public floating_network_name = {{ tempest_public_net_name }}
[network-feature-enabled] [network-feature-enabled]