From 4878640e18d8c5b75ca56914fbd8e2ebec942117 Mon Sep 17 00:00:00 2001 From: Damian Dabrowski Date: Mon, 11 Jul 2022 17:12:49 +0200 Subject: [PATCH] Make router creation independent from tempest_public_net_create Currently when ``tempest_router_create`` is enabled, playbook requires ``tempest_public_net_create`` to be set. It's an incorrect behavior. Router creation should only require public network to exist. It does not matter if that public network was created by tempest or operator. Change-Id: Icaa223ed03837a68e9e84a89560cc2df10e3ed3e --- tasks/tempest_resources.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/tempest_resources.yml b/tasks/tempest_resources.yml index 45b958ca..60bda8f0 100644 --- a/tasks/tempest_resources.yml +++ b/tasks/tempest_resources.yml @@ -56,7 +56,7 @@ - name: Ensure that all required variables are set when tempest_router_create is enabled assert: that: - - tempest_public_net_create + - (tempest_public_net_create or tempest_neutron_public_network_id is defined) - tempest_private_net_create when: - tempest_router_create @@ -264,7 +264,7 @@ interface: "{{ tempest_interface_name }}" validate_certs: "{{ tempest_keystone_interface_insecure | ternary(false, true) }}" name: router - network: "{{ tempest_public_net_name }}" + network: "{{ tempest_neutron_public_network_id }}" interfaces: - "{{ tempest_private_subnet_name }}" project: "{{ keystone_demo_tenant_id }}"