PowerVC: Allow bootstrap ignition upload to Swift

PowerVC does not mirror glance images across the HA cluster.  So use
Swift to host the bootstrap's ignition file.

Author: hamzy

pkg/infrastructure/openstack/clusterapi/clusterapi.go

@@ -55,12 +55,14 @@ func (p Provider) PreProvision(ctx context.Context, in clusterapi.PreProvisionIn
 		return fmt.Errorf("failed to tag VIP ports: %w", err)
 	}
 
-	// upload the corresponding image to Glance if rhcosImage contains a
-	// URL. If rhcosImage contains a name, then that points to an existing
-	// Glance image.
-	if imageName, isURL := rhcos.GenerateOpenStackImageName(rhcosImage, infraID); isURL {
-		if err := preprovision.UploadBaseImage(ctx, installConfig.Config.Platform.OpenStack.Cloud, rhcosImage, imageName, infraID, installConfig.Config.Platform.OpenStack.ClusterOSImageProperties); err != nil {
-			return fmt.Errorf("failed to upload the RHCOS base image: %w", err)
+	if installConfig.Config.Platform.Name() != powervc.Name {
+		// upload the corresponding image to Glance if rhcosImage contains a
+		// URL. If rhcosImage contains a name, then that points to an existing
+		// Glance image.
+		if imageName, isURL := rhcos.GenerateOpenStackImageName(rhcosImage, infraID); isURL {
+			if err := preprovision.UploadBaseImage(ctx, installConfig.Config.Platform.OpenStack.Cloud, rhcosImage, imageName, infraID, installConfig.Config.Platform.OpenStack.ClusterOSImageProperties); err != nil {
+				return fmt.Errorf("failed to upload the RHCOS base image: %w", err)
+			}
 		}
 	}
 
@@ -143,7 +145,9 @@ func (p Provider) Ignition(ctx context.Context, in clusterapi.IgnitionInput) ([]
 		installConfig    = in.InstallConfig
 	)
 
-	ignShim, err := preprovision.UploadIgnitionAndBuildShim(ctx, installConfig.Config.Platform.OpenStack.Cloud, infraID, installConfig.Config.Proxy, bootstrapIgnData)
+	useGlance := installConfig.Config.Platform.Name() == openstack.Name
+
+	ignShim, err := preprovision.UploadIgnitionAndBuildShim(ctx, installConfig.Config.Platform.OpenStack.Cloud, infraID, installConfig.Config.Proxy, bootstrapIgnData, useGlance)
 	if err != nil {
 		return nil, fmt.Errorf("failed to upload and build ignition shim: %w", err)
 	}

pkg/infrastructure/openstack/preprovision/bootstrapignition.go

@@ -16,6 +16,8 @@ import (
 	"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
 	"github.com/gophercloud/gophercloud/v2/openstack/image/v2/imagedata"
 	"github.com/gophercloud/gophercloud/v2/openstack/image/v2/images"
+	"github.com/gophercloud/gophercloud/v2/openstack/objectstorage/v1/containers"
+	"github.com/gophercloud/gophercloud/v2/openstack/objectstorage/v1/objects"
 	"github.com/gophercloud/utils/v2/openstack/clientconfig"
 	"github.com/sirupsen/logrus"
 	"github.com/vincent-petithory/dataurl"
@@ -25,6 +27,7 @@ import (
 	"github.com/openshift/installer/pkg/asset/ignition"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/types"
+	openstacktypes "github.com/openshift/installer/pkg/types/openstack"
 	openstackdefaults "github.com/openshift/installer/pkg/types/openstack/defaults"
 )
 
@@ -49,8 +52,9 @@ func ReplaceBootstrapIgnitionInTFVars(ctx context.Context, tfvarsFile *asset.Fil
 		return fmt.Errorf("failed to decode bootstrap's Ignition")
 	}
 
-	logrus.Debugf("Uploading Ignition to Glance")
-	bootstrapShim, err := UploadIgnitionAndBuildShim(ctx, installConfig.Config.Platform.OpenStack.Cloud, clusterID.InfraID, installConfig.Config.Proxy, []byte(bootstrapIgnition))
+	useGlance := installConfig.Config.Platform.Name() == openstacktypes.Name
+
+	bootstrapShim, err := UploadIgnitionAndBuildShim(ctx, installConfig.Config.Platform.OpenStack.Cloud, clusterID.InfraID, installConfig.Config.Proxy, []byte(bootstrapIgnition), useGlance)
 	if err != nil {
 		return fmt.Errorf("failed to build bootstrap's Ignition shim: %w", err)
 	}
@@ -72,11 +76,29 @@ func ReplaceBootstrapIgnitionInTFVars(ctx context.Context, tfvarsFile *asset.Fil
 }
 
 // UploadIgnitionAndBuildShim uploads the bootstrap Ignition config in Glance.
-func UploadIgnitionAndBuildShim(ctx context.Context, cloud string, infraID string, proxy *types.Proxy, bootstrapIgn []byte) ([]byte, error) {
-	opts := openstackdefaults.DefaultClientOpts(cloud)
-	conn, err := openstackdefaults.NewServiceClient(ctx, "image", opts)
-	if err != nil {
-		return nil, err
+func UploadIgnitionAndBuildShim(ctx context.Context, cloud string, infraID string, proxy *types.Proxy, bootstrapIgn []byte, useGlance bool) ([]byte, error) {
+	var (
+		opts *clientconfig.ClientOpts
+		conn *gophercloud.ServiceClient
+		err  error
+	)
+
+	if useGlance {
+		logrus.Debugf("Uploading Ignition to Glance")
+
+		opts = openstackdefaults.DefaultClientOpts(cloud)
+		conn, err = openstackdefaults.NewServiceClient(ctx, "image", opts)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		logrus.Debugf("Uploading Ignition to Swift")
+
+		opts = openstackdefaults.DefaultClientOpts(cloud)
+		conn, err = openstackdefaults.NewServiceClient(ctx, "object-store", opts)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	var userCA []byte
@@ -102,6 +124,7 @@ func UploadIgnitionAndBuildShim(ctx context.Context, cloud string, infraID strin
 	// https://docs.openstack.org/api-ref/identity/v3/?expanded=token-authentication-with-scoped-authorization-detail#token-authentication-with-scoped-authorization
 	// Unfortunately this feature is not currently supported by Terraform, so we had to implement it here.
 	var glancePublicURL string
+	var swiftPublicURL string
 	{
 		// Authenticate in OpenStack, get the token and extract the service catalog
 		var serviceCatalog *tokens.ServiceCatalog
@@ -122,34 +145,73 @@ func UploadIgnitionAndBuildShim(ctx context.Context, cloud string, infraID strin
 		if err != nil {
 			return nil, err
 		}
-		glancePublicURL, err = gophercloud_openstack.V3EndpointURL(serviceCatalog, gophercloud.EndpointOpts{
-			Type:         "image",
-			Availability: gophercloud.AvailabilityPublic,
-			Region:       clientConfigCloud.RegionName,
-		})
-		if err != nil {
-			return nil, fmt.Errorf("cannot retrieve Glance URL from the service catalog: %w", err)
+		if useGlance {
+			glancePublicURL, err = gophercloud_openstack.V3EndpointURL(serviceCatalog, gophercloud.EndpointOpts{
+				Type:         "image",
+				Availability: gophercloud.AvailabilityPublic,
+				Region:       clientConfigCloud.RegionName,
+			})
+			if err != nil {
+				return nil, fmt.Errorf("cannot retrieve Glance URL from the service catalog: %w", err)
+			}
+		} else {
+			swiftPublicURL, err = gophercloud_openstack.V3EndpointURL(serviceCatalog, gophercloud.EndpointOpts{
+				Type:         "object-store",
+				Availability: gophercloud.AvailabilityPublic,
+				Region:       clientConfigCloud.RegionName,
+			})
+			if err != nil {
+				return nil, fmt.Errorf("cannot retrieve Swift URL from the service catalog: %w", err)
+			}
 		}
 	}
 
 	// upload the bootstrap Ignition config in Glance and save its location
 	var bootstrapConfigURL string
 	{
-		img, err := images.Create(ctx, conn, images.CreateOpts{
-			Name:            infraID + "-ignition",
-			ContainerFormat: "bare",
-			DiskFormat:      "raw",
-			Tags:            []string{"openshiftClusterID=" + infraID},
-		}).Extract()
-		if err != nil {
-			return nil, fmt.Errorf("unable to create a Glance image for the bootstrap server's Ignition file: %w", err)
-		}
+		if useGlance {
+			img, err := images.Create(ctx, conn, images.CreateOpts{
+				Name:            infraID + "-ignition",
+				ContainerFormat: "bare",
+				DiskFormat:      "raw",
+				Tags:            []string{"openshiftClusterID=" + infraID},
+			}).Extract()
+			if err != nil {
+				return nil, fmt.Errorf("unable to create a Glance image for the bootstrap server's Ignition file: %w", err)
+			}
 
-		if res := imagedata.Upload(ctx, conn, img.ID, bytes.NewReader(bootstrapIgn)); res.Err != nil {
-			return nil, fmt.Errorf("unable to upload a Glance image for the bootstrap server's Ignition file: %w", res.Err)
-		}
+			if res := imagedata.Upload(ctx, conn, img.ID, bytes.NewReader(bootstrapIgn)); res.Err != nil {
+				return nil, fmt.Errorf("unable to upload a Glance image for the bootstrap server's Ignition file: %w", res.Err)
+			}
+
+			bootstrapConfigURL = glancePublicURL + img.File
+		} else {
+			name := infraID + "-ignition"
 
-		bootstrapConfigURL = glancePublicURL + img.File
+			_, err = containers.Create(ctx,
+				conn,
+				name, // container name
+				containers.CreateOpts{
+					ContentType: "text/plain",
+				}).Extract()
+			if err != nil {
+				return nil, fmt.Errorf("unable to create a Swift container for the bootstrap server's Ignition file: %w", err)
+			}
+
+			_, err = objects.Create(ctx,
+				conn,
+				name, // container name
+				name, // object name
+				objects.CreateOpts{
+					ContentType: "text/plain",
+					Content:     strings.NewReader(string(bootstrapIgn)),
+				}).Extract()
+			if err != nil {
+				return nil, fmt.Errorf("unable to create a Swift image for the bootstrap server's Ignition file: %w", err)
+			}
+
+			bootstrapConfigURL = fmt.Sprintf("%s%s/%s", swiftPublicURL, name, name)
+		}
 	}
 
 	// To allow Ignition to download its config on the bootstrap machine from a location secured by a