OpenStack: fix enforcement of Masters Schedulable

This commit fixes the decoding of the cluster scheduler file
by using the apropriate yaml library. Also, it enforces both
IPv4 and IPv6 remote CIDRs on the router sg rule created when the
master is schedulable.

Author: MaysaMacedo

pkg/infrastructure/openstack/clusterapi/clusterapi.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
 	capo "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/yaml"
 
 	configv1 "github.com/openshift/api/config/v1"
 	mapov1alpha1 "github.com/openshift/api/machine/v1alpha1"

pkg/infrastructure/openstack/preprovision/securitygroups.go

@@ -203,7 +203,7 @@ func SecurityGroups(ctx context.Context, installConfig *installconfig.InstallCon
 			addRules(ctx, r, masterGroup.ID, serviceOVNDB, ipVersion, CIDRs)
 			addRules(ctx, r, workerGroup.ID, serviceRouter, ipVersion, CIDRs)
 			if mastersSchedulable {
-				addRules(ctx, r, masterGroup.ID, serviceRouter, rules.EtherType4, machineV4CIDRs)
+				addRules(ctx, r, masterGroup.ID, serviceRouter, rules.EtherType4, CIDRs)
 			}
 		}