Changes for oz/imagefactory config naming

This commit is contained in:
Neil Hanlon 2022-07-04 16:22:12 -04:00
parent 1c90edaa70
commit fe4daffb25
Signed by untrusted user: neil
GPG Key ID: 705BC21EC3C70F34
2 changed files with 3 additions and 2 deletions

View File

@ -176,6 +176,7 @@ class ImageBuild:
iso8601date=BUILDTIME.strftime("%Y%m%d"), iso8601date=BUILDTIME.strftime("%Y%m%d"),
installdir="kickstart" if self.cli_args.kickstartdir else "os", installdir="kickstart" if self.cli_args.kickstartdir else "os",
major=self.architecture.major, major=self.architecture.major,
minor=self.architecture.minor,
release=self.release, release=self.release,
size="10G", size="10G",
type=self.image_type, type=self.image_type,

View File

@ -1,8 +1,8 @@
<template> <template>
<name>Rocky-{{major}}-{{type}}-{{version_variant}}.{{iso8601date}}.{{release}}.{{architecture}}</name> <name>Rocky-{{major}}-{{type}}-{{version_variant}}.{{iso8601date}}.{{release}}.{{architecture}}</name>
<os> <os>
<name>Fedora</name> <name>RHEL-{{major}}</name>
<version>{{fedora_version}}</version> <version>{{minor}}</version>
<arch>{{architecture}}</arch> <arch>{{architecture}}</arch>
<install type='url'> <install type='url'>
<url>https://dl.rockylinux.org/stg/rocky/{{major}}/BaseOS/{{architecture}}/{{installdir}}</url> <url>https://dl.rockylinux.org/stg/rocky/{{major}}/BaseOS/{{architecture}}/{{installdir}}</url>