distro/fedora: make openstack image an alias of qcow2

Fedora Cloud SIG considers the qcow2 (cloud base) image as a good fit also for
OpenStack. Let's make our openstack image just an alias of qcow2. Once again,
this removes some duplicated code.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>

internal/distro/fedora/distro.go

@@ -265,32 +265,6 @@ var (
 		basePartitionTables: defaultBasePartitionTables,
 	}
 
-	openstackImgType = imageType{
-		name:     "openstack",
-		filename: "disk.qcow2",
-		mimeType: "application/x-qemu-disk",
-		packageSets: map[string]packageSetFunc{
-			osPkgsKey: openstackCommonPackageSet,
-		},
-		defaultImageConfig: &distro.ImageConfig{
-			Locale: common.ToPtr("en_US.UTF-8"),
-			EnabledServices: []string{
-				"cloud-init.service",
-				"cloud-config.service",
-				"cloud-final.service",
-				"cloud-init-local.service",
-			},
-		},
-		kernelOptions:       defaultKernelOptions,
-		bootable:            true,
-		defaultSize:         2 * common.GibiByte,
-		image:               liveImage,
-		buildPipelines:      []string{"build"},
-		payloadPipelines:    []string{"os", "image", "qcow2"},
-		exports:             []string{"qcow2"},
-		basePartitionTables: defaultBasePartitionTables,
-	}
-
 	containerImgType = imageType{
 		name:     "container",
 		filename: "container.tar",
@@ -509,6 +483,9 @@ func newDistro(version int) distro.Distro {
 	amiImgType.exports = []string{"image"}
 	amiImgType.environment = &environment.EC2{}
 
+	openstackImgType := qcow2ImgType
+	openstackImgType.name = "openstack"
+
 	x86_64.addImageTypes(
 		&platform.X86{
 			BIOS:       true,

internal/distro/fedora/package_sets.go

@@ -104,29 +104,6 @@ func vmdkCommonPackageSet(t *imageType) rpmmd.PackageSet {
 	return ps
 }
 
-func openstackCommonPackageSet(t *imageType) rpmmd.PackageSet {
-	ps := rpmmd.PackageSet{
-		Include: []string{
-			"@core",
-			"chrony",
-			"spice-vdagent",
-			"qemu-guest-agent",
-			"xen-libs",
-			"langpacks-en",
-			"cloud-init",
-			"libdrm",
-		},
-		Exclude: []string{
-			"dracut-config-rescue",
-			"geolite2-city",
-			"geolite2-country",
-			"zram-generator-defaults",
-		},
-	}
-
-	return ps
-}
-
 // fedora iot commit OS package set
 func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
 	ps := rpmmd.PackageSet{