From 39f4d26d92d2aa5f9e9bd4635d7938097a20b59d Mon Sep 17 00:00:00 2001
From: Roman Dobosz <gryf73@gmail.com>
Date: Wed, 13 Dec 2023 11:40:00 +0100
Subject: [PATCH] OCPBUGS-25132: Fixes for the OpensStack UPI playbooks.

This commit changes `ether_type` field to `ethertype` so it will not
break on older ansible openstack collections.
Also, fixed condition for IPv6 block.
---
 upi/openstack/security-groups.yaml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/upi/openstack/security-groups.yaml b/upi/openstack/security-groups.yaml
index 7d8c3d372a..8ca428b940 100644
--- a/upi/openstack/security-groups.yaml
+++ b/upi/openstack/security-groups.yaml
@@ -323,7 +323,7 @@
     - name: 'Create master-sg IPv6 rule "OpenShift API"'
       openstack.cloud.security_group_rule:
         security_group: "{{ os_sg_master }}"
-        ether_type: IPv6
+        ethertype: IPv6
         protocol: tcp
         port_range_min: 6443
         port_range_max: 6443
@@ -331,7 +331,7 @@
     - name: 'Create worker-sg IPv6 rule "Ingress HTTP"'
       openstack.cloud.security_group_rule:
         security_group: "{{ os_sg_worker }}"
-        ether_type: IPv6
+        ethertype: IPv6
         protocol: tcp
         port_range_min: 80
         port_range_max: 80
@@ -339,7 +339,7 @@
     - name: 'Create worker-sg IPv6 rule "Ingress HTTPS"'
       openstack.cloud.security_group_rule:
         security_group: "{{ os_sg_worker }}"
-        ether_type: IPv6
+        ethertype: IPv6
         protocol: tcp
         port_range_min: 443
         port_range_max: 443
@@ -347,7 +347,7 @@
     - name: 'Create master-sg rule "master ingress HTTP (TCP)"'
       openstack.cloud.security_group_rule:
         security_group: "{{ os_sg_master }}"
-        ether_type: IPv6
+        ethertype: IPv6
         protocol: tcp
         port_range_min: 80
         port_range_max: 80
@@ -356,7 +356,7 @@
     - name: 'Create master-sg rule "master ingress HTTPS (TCP)"'
       openstack.cloud.security_group_rule:
         security_group: "{{ os_sg_master }}"
-        ether_type: IPv6
+        ethertype: IPv6
         protocol: tcp
         port_range_min: 443
         port_range_max: 443
@@ -365,12 +365,11 @@
     - name: 'Create master-sg rule "router"'
       openstack.cloud.security_group_rule:
         security_group: "{{ os_sg_master }}"
-        ether_type: IPv6
+        ethertype: IPv6
         protocol: tcp
         remote_ip_prefix: "{{ os_subnet_range }}"
         port_range_min: 1936
         port_range_max: 1936
       when: os_master_schedulable is defined and os_master_schedulable
 
-    when:
-      when: os_subnet6 is defined
+    when: os_subnet6 is defined