From 3e90aa272b64bc7d823c6fdd771ab4871424217a Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 11 Apr 2018 20:53:08 +0000 Subject: [PATCH] Allow public network name to be changed This can be overridden in the defaults but hardcoded values prevent the router being created, and floating IP pool being found Change-Id: I57e4bfb5ab93971a757557e6a68475f2baceace2 --- tasks/tempest_resources.yml | 2 +- templates/tempest.conf.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/tempest_resources.yml b/tasks/tempest_resources.yml index 986f9a6f..b9f6aa89 100644 --- a/tasks/tempest_resources.yml +++ b/tasks/tempest_resources.yml @@ -232,7 +232,7 @@ endpoint_type: internal validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}" name: router - network: public + network: "{{ tempest_public_net_name }}" interfaces: - "{{ tempest_private_subnet_name }}" project: "{{ keystone_demo_tenant_id }}" diff --git a/templates/tempest.conf.j2 b/templates/tempest.conf.j2 index 90242842..70e871a4 100644 --- a/templates/tempest.conf.j2 +++ b/templates/tempest.conf.j2 @@ -92,7 +92,7 @@ project_network_cidr = {{ tempest_network_tenant_network_cidr }} project_network_mask_bits = {{ tempest_network_tenant_network_mask_bits }} project_networks_reachable = false public_network_id = {{ tempest_neutron_public_network_id }} -floating_network_name = public +floating_network_name = {{ tempest_public_net_name }} [network-feature-enabled]