From 2a6f060fbd6aaff617685ee35ad6d32b570e639a Mon Sep 17 00:00:00 2001 From: Raoul Scarazzini Date: Wed, 17 Oct 2018 19:03:43 +0200 Subject: [PATCH] Add conditions for allowing traffic for controllers We need to use in allow-traffic-for-controller.yml the same conditionals that we have in prep-network [1] otherwise the script to allow the traffic will be executed and, since it expects to find the BOOTSTACK_MASQ iptables chain, will fail. [1] roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2 Change-Id: Ia104eecbe29c1eee230c2ccbc5926ca8bfbffc83 --- .../tasks/allow-traffic-for-controller.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml b/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml index c579b0aef..de6001948 100644 --- a/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml +++ b/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml @@ -10,6 +10,8 @@ become: yes shell: > "{{ working_dir }}"/allow-traffic-for-controller.sh - when: network_isolation|bool and undercloud_type == "baremetal" - - + when: + - network_isolation|bool + - undercloud_type == "baremetal" + - not overcloud_ipv6|bool + - release in ['newton','ocata','pike','queens'] or not containerized_undercloud|bool