Merge pull request openshift#7099 from shiftstack/enable-ipv6-traffic

OpenStack: enable ingress traffic for dual-stack installations

Author: openshift-merge-robot

data/data/openstack/masters/sg-master.tf

@@ -78,6 +78,18 @@ resource "openstack_networking_secgroup_rule_v2" "master_ingress_api" {
   description       = local.description
 }
 
+resource "openstack_networking_secgroup_rule_v2" "master_ingress_api_v6" {
+  count             = length(var.machine_v6_cidrs)
+  direction         = "ingress"
+  ethertype         = "IPv6"
+  protocol          = "tcp"
+  port_range_min    = 6443
+  port_range_max    = 6443
+  remote_ip_prefix  = "::/0"
+  security_group_id = openstack_networking_secgroup_v2.master.id
+  description       = local.description
+}
+
 resource "openstack_networking_secgroup_rule_v2" "master_ingress_vxlan" {
   count             = length(var.machine_v4_cidrs)
   direction         = "ingress"
@@ -280,6 +292,30 @@ resource "openstack_networking_secgroup_rule_v2" "master_ingress_https" {
   description       = local.description
 }
 
+resource "openstack_networking_secgroup_rule_v2" "master_ingress_http_v6" {
+  count             = (var.masters_schedulable && length(var.machine_v6_cidrs) > 0) ? 1 : 0
+  direction         = "ingress"
+  ethertype         = "IPv6"
+  protocol          = "tcp"
+  port_range_min    = 80
+  port_range_max    = 80
+  remote_ip_prefix  = "::/0"
+  security_group_id = openstack_networking_secgroup_v2.master.id
+  description       = local.description
+}
+
+resource "openstack_networking_secgroup_rule_v2" "master_ingress_https_v6" {
+  count             = (var.masters_schedulable && length(var.machine_v6_cidrs) > 0) ? 1 : 0
+  direction         = "ingress"
+  ethertype         = "IPv6"
+  protocol          = "tcp"
+  port_range_min    = 443
+  port_range_max    = 443
+  remote_ip_prefix  = "::/0"
+  security_group_id = openstack_networking_secgroup_v2.master.id
+  description       = local.description
+}
+
 resource "openstack_networking_secgroup_rule_v2" "master_ingress_router" {
   count             = var.masters_schedulable ? length(var.machine_v4_cidrs) : 0
   direction         = "ingress"

data/data/openstack/masters/sg-worker.tf

@@ -41,6 +41,18 @@ resource "openstack_networking_secgroup_rule_v2" "worker_ingress_http" {
   description       = local.description
 }
 
+resource "openstack_networking_secgroup_rule_v2" "worker_ingress_http_v6" {
+  count             = length(var.machine_v6_cidrs)
+  direction         = "ingress"
+  ethertype         = "IPv6"
+  protocol          = "tcp"
+  port_range_min    = 80
+  port_range_max    = 80
+  remote_ip_prefix  = "::/0"
+  security_group_id = openstack_networking_secgroup_v2.worker.id
+  description       = local.description
+}
+
 resource "openstack_networking_secgroup_rule_v2" "worker_ingress_https" {
   direction         = "ingress"
   ethertype         = "IPv4"
@@ -52,6 +64,18 @@ resource "openstack_networking_secgroup_rule_v2" "worker_ingress_https" {
   description       = local.description
 }
 
+resource "openstack_networking_secgroup_rule_v2" "worker_ingress_https_v6" {
+  count             = length(var.machine_v6_cidrs)
+  direction         = "ingress"
+  ethertype         = "IPv6"
+  protocol          = "tcp"
+  port_range_min    = 443
+  port_range_max    = 443
+  remote_ip_prefix  = "::/0"
+  security_group_id = openstack_networking_secgroup_v2.worker.id
+  description       = local.description
+}
+
 resource "openstack_networking_secgroup_rule_v2" "worker_ingress_router" {
   count             = length(var.machine_v4_cidrs)
   direction         = "ingress"