You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
88 lines
8.9 KiB
88 lines
8.9 KiB
From 04f9a1a06ede7a2265b65130ad1b68942a2c0eb3 Mon Sep 17 00:00:00 2001
|
|
From: Eugene Zamriy <ezamriy@msvsphere.ru>
|
|
Date: Thu, 30 Mar 2023 18:17:50 +0300
|
|
Subject: [PATCH] Add MSVSphere 9.1 support
|
|
|
|
---
|
|
internal/distro/rhel9/distro.go | 20 ++++++++++++++++++++
|
|
internal/distroregistry/distroregistry.go | 1 +
|
|
repositories/msvsphere-91.json | 16 ++++++++++++++++
|
|
3 files changed, 37 insertions(+)
|
|
create mode 100644 repositories/msvsphere-91.json
|
|
|
|
diff --git a/internal/distro/rhel9/distro.go b/internal/distro/rhel9/distro.go
|
|
index b4814c3..60faf2e 100644
|
|
--- a/internal/distro/rhel9/distro.go
|
|
+++ b/internal/distro/rhel9/distro.go
|
|
@@ -132,6 +132,18 @@ var distroMap = map[string]distribution{
|
|
runner: "org.osbuild.centos9",
|
|
defaultImageConfig: defaultDistroImageConfig,
|
|
},
|
|
+ "msvsphere-91": {
|
|
+ name: "msvsphere-91",
|
|
+ product: "MSVSphere",
|
|
+ osVersion: "9.1",
|
|
+ releaseVersion: "9",
|
|
+ modulePlatformID: "platform:el9",
|
|
+ vendor: "msvsphere",
|
|
+ ostreeRefTmpl: "msvsphere/9/%s/edge",
|
|
+ isolabelTmpl: "MSVSphere-9-1-0-BaseOS-%s",
|
|
+ runner: "org.osbuild.rhel91",
|
|
+ defaultImageConfig: defaultDistroImageConfig,
|
|
+ },
|
|
}
|
|
|
|
func (d *distribution) Name() string {
|
|
@@ -648,6 +660,14 @@ func NewCentosHostDistro(name, modulePlatformID, ostreeRef string) distro.Distro
|
|
return newDistro("centos-9")
|
|
}
|
|
|
|
+func NewMSVSphere() distro.Distro {
|
|
+ return newDistro("msvsphere-91")
|
|
+}
|
|
+
|
|
+func NewMSVSphereHostDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
|
|
+ return newDistro("msvsphere-91")
|
|
+}
|
|
+
|
|
func newDistro(distroName string) distro.Distro {
|
|
const GigaByte = 1024 * 1024 * 1024
|
|
|
|
diff --git a/internal/distroregistry/distroregistry.go b/internal/distroregistry/distroregistry.go
|
|
index 586d78a..bca7dce 100644
|
|
--- a/internal/distroregistry/distroregistry.go
|
|
+++ b/internal/distroregistry/distroregistry.go
|
|
@@ -28,6 +28,7 @@ var supportedDistros = []supportedDistro{
|
|
{rhel9.New, rhel9.NewHostDistro},
|
|
{rhel9.NewRHEL91, rhel9.NewRHEL91HostDistro},
|
|
{rhel9.NewCentos, rhel9.NewCentosHostDistro},
|
|
+ {rhel9.NewMSVSphere, rhel9.NewMSVSphereHostDistro},
|
|
}
|
|
|
|
type supportedDistro struct {
|
|
diff --git a/repositories/msvsphere-91.json b/repositories/msvsphere-91.json
|
|
new file mode 100644
|
|
index 0000000..114369e
|
|
--- /dev/null
|
|
+++ b/repositories/msvsphere-91.json
|
|
@@ -0,0 +1,16 @@
|
|
+{
|
|
+ "x86_64": [
|
|
+ {
|
|
+ "name": "baseos",
|
|
+ "baseurl": "https://repo.msvsphere.ru/msvsphere/9.1/BaseOS/x86_64/os/",
|
|
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=PzTF\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
+ "check_gpg": true
|
|
+ },
|
|
+ {
|
|
+ "name": "appstream",
|
|
+ "baseurl": "https://repo.msvsphere.ru/msvsphere/9.1/AppStream/x86_64/os/",
|
|
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=PzTF\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
|
+ "check_gpg": true
|
|
+ }
|
|
+ ]
|
|
+}
|
|
--
|
|
2.39.2
|
|
|