Skip to content

Support uploading to OpenStack #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
achilleas-k merged 1 commit into from
Oct 20, 2025
+30 −4
Merged

Support uploading to OpenStack #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmd/image-builder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,9 @@ operating systems like Fedora, CentOS and RHEL with easy customizations support.
uploadCmd.Flags().String("libvirt-connection", "", "connection URI (only for type=libvirt)")
uploadCmd.Flags().String("libvirt-pool", "", "pool name (only for type=libvirt)")
uploadCmd.Flags().String("libvirt-volume", "", "volume name (only for type=libvirt)")
uploadCmd.Flags().String("openstack-image", "", "name for the uploaded image (only for type=openstack)")
Copy link
Member

@supakeen supakeen Oct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do these type= things here (and above) actually mean? I never quite looked at the upload command in depth.

Copy link
Contributor Author

@FrostyX FrostyX Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding is that it can be only used for image-builder upload --to openstack or --to aws, etc. Not sure why the descriptions say type= though. I did the same that the AWS uploader did.

Copy link
Member

@achilleas-k achilleas-k Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it just documenting what image type the uploader applies to? You can't (or shouldn't) upload a vhd to AWS, only ami.

Copy link
Member

@supakeen supakeen Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@achilleas-k That was my first thought as well but only ami is an image type?

Copy link
Member

@achilleas-k achilleas-k Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess for aws it would be more correct to either list everything (e.g. ec2) or nothing. But for this one it's actually correct. The only openstack image type we have is openstack it's all good.

uploadCmd.Flags().String("openstack-disk-format", "raw", "the disk format of a virtual machine image (only for type=openstack)")
uploadCmd.Flags().String("openstack-container-format", "bare", "this indicates if the image contains metadata about the VM (only for type=openstack)")
uploadCmd.Flags().String("arch", "", "upload for the given architecture")
rootCmd.AddCommand(uploadCmd)

Expand Down
24 changes: 24 additions & 0 deletions cmd/image-builder/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/osbuild/images/pkg/cloud"
"github.com/osbuild/images/pkg/cloud/awscloud"
"github.com/osbuild/images/pkg/cloud/libvirt"
"github.com/osbuild/images/pkg/cloud/openstack"
"github.com/osbuild/images/pkg/platform"
)

Expand All @@ -31,6 +32,7 @@ var ErrUploadTypeUnsupported = errors.New("unsupported type")

var awscloudNewUploader = awscloud.NewUploader
var libvirtNewUploader = libvirt.NewUploader
var openstackNewUploader = openstack.NewUploader

func uploadImageWithProgress(uploader cloud.Uploader, imagePath string) error {
f, err := os.Open(imagePath)
Expand Down Expand Up @@ -74,6 +76,8 @@ func uploaderFor(cmd *cobra.Command, typeOrCloud string, targetArch string, boot
return uploaderForCmdAWS(cmd, targetArch, bootMode)
case "libvirt":
return uploaderForLibvirt(cmd, targetArch, bootMode)
case "openstack":
return uploaderForCmdOpenstack(cmd, targetArch, bootMode)
default:
return nil, fmt.Errorf("%w: %q", ErrUploadTypeUnsupported, typeOrCloud)
}
Expand Down Expand Up @@ -150,6 +154,26 @@ func uploaderForLibvirt(cmd *cobra.Command, targetArchStr string, bootMode *plat
return libvirtNewUploader(connection, pool, volume)
}

func uploaderForCmdOpenstack(cmd *cobra.Command, targetArchStr string, bootMode *platform.BootMode) (cloud.Uploader, error) {
image, err := cmd.Flags().GetString("openstack-image")
if err != nil {
return nil, err
}
diskFormat, err := cmd.Flags().GetString("openstack-disk-format")
if err != nil {
return nil, err
}
containerFormat, err := cmd.Flags().GetString("openstack-container-format")
if err != nil {
return nil, err
}
opts := &openstack.UploaderOptions{
DiskFormat: diskFormat,
ContainerFormat: containerFormat,
}
return openstackNewUploader(image, opts)
}

func detectArchFromImagePath(imagePath string) string {
// This detection is currently rather naive, we just look for
// the file name and try to infer from that. We could extend
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ require (
github.com/google/go-containerregistry v0.20.3 // indirect
github.com/google/go-intervals v0.0.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gophercloud/gophercloud/v2 v2.8.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gophercloud/gophercloud/v2 v2.8.0 h1:of2+8tT6+FbEYHfYC8GBu8TXJNsXYSNm9KuvpX7Neqo=
github.com/gophercloud/gophercloud/v2 v2.8.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk=
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
Expand Down Expand Up @@ -241,12 +243,8 @@ github.com/opencontainers/runtime-spec v1.2.1 h1:S4k4ryNgEpxW1dzyqffOmhI1BHYcjzU
github.com/opencontainers/runtime-spec v1.2.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplUkdTrmPb8=
github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U=
github.com/osbuild/blueprint v1.15.0 h1:A6zNeS8nU9hyiji5ooKDgjcptnIyO9us9VULrAdTT/o=
github.com/osbuild/blueprint v1.15.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
github.com/osbuild/blueprint v1.16.0 h1:f/kHih+xpeJ1v7wtIfzdHPZTsiXsqKeDQ1+rrue6298=
github.com/osbuild/blueprint v1.16.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
github.com/osbuild/images v0.204.0 h1:vP/48Y/wqm0uFPXApZpOIJXKc0SAYeqjt1HCaUyUQ5M=
github.com/osbuild/images v0.204.0/go.mod h1:YhhDsTY4IARBvPCrDFqD4tMfiBtwoZ8jC5nPqXfBZ+M=
github.com/osbuild/images v0.206.0 h1:F9G6dnqrURRUcWE2eWIPQLzHutSCT0OyWMcITK28uCQ=
github.com/osbuild/images v0.206.0/go.mod h1:iF6bTLzBtyp9l27fexsD5AzwHEn9+bXF5Jr4HHQecmI=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down
Loading