From ec0e83880acf12b68047582ea0bbb579d8a20c70 Mon Sep 17 00:00:00 2001 From: Alexsander Silva de Souza Date: Fri, 15 Dec 2023 10:20:03 -0300 Subject: [PATCH 1/2] fix OL makefiles also updates manual build instructions fixes #183 --- ol8/Makefile | 3 +-- ol8/README.md | 3 ++- ol9/Makefile | 3 +-- ol9/README.md | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ol8/Makefile b/ol8/Makefile index 9961a2a5..29befead 100644 --- a/ol8/Makefile +++ b/ol8/Makefile @@ -11,8 +11,7 @@ export PACKER_LOG KS_PROXY all: ol8.tar.gz -check-deps: - $(call check_packages_deps) +$(eval $(call check_packages_deps)) ol8.tar.gz: check-deps clean http/ol8.ks ${PACKER} init ol8.pkr.hcl && ${PACKER} build ol8.pkr.hcl diff --git a/ol8/README.md b/ol8/README.md index f665e68c..a02a66ea 100644 --- a/ol8/README.md +++ b/ol8/README.md @@ -46,7 +46,8 @@ be in packer-maas/ol8, where this file is located. Once in packer-maas/ol8 you can generate an image with: ```shell -packer init +envsubst '$${KS_PROXY}' < http/ol8.ks.in | tee http/ol8.ks +packer init . PACKER_LOG=1 packer build . ``` diff --git a/ol9/Makefile b/ol9/Makefile index de0371b1..73e5a311 100644 --- a/ol9/Makefile +++ b/ol9/Makefile @@ -11,8 +11,7 @@ export PACKER_LOG KS_PROXY all: ol9.tar.gz -check-deps: - $(call check_packages_deps) +$(eval $(call check_packages_deps)) ol9.tar.gz: check-deps clean http/ol9.ks ${PACKER} init ol9.pkr.hcl && ${PACKER} build ol9.pkr.hcl diff --git a/ol9/README.md b/ol9/README.md index 521da661..995c4bef 100644 --- a/ol9/README.md +++ b/ol9/README.md @@ -46,7 +46,8 @@ be in packer-maas/ol9, where this file is located. Once in packer-maas/ol9 you can generate an image with: ```shell -packer init +envsubst '$${KS_PROXY}' < http/ol9.ks.in | tee http/ol9.ks +packer init . PACKER_LOG=1 packer build . ``` From a8219f4701b4919ffc4a6d7641a2667bd184e3bb Mon Sep 17 00:00:00 2001 From: Alexsander Silva de Souza Date: Fri, 15 Dec 2023 10:26:58 -0300 Subject: [PATCH 2/2] OL requires unreleased MAAS features --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 601d5622..7bde4e68 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Read more about how [custom images](https://maas.io/docs/how-to-customise-images ## Existing templates -| **OS** | **Maturity Level** | **MAAS Version** | +| **OS** | **Maturity Level** | **MAAS Version** | |-----------------|:------------------:|:-----------------| | CentOS 6 | EOL | >= 1.6 | | CentOS 7 | Stable | >= 2.3 | @@ -20,8 +20,8 @@ Read more about how [custom images](https://maas.io/docs/how-to-customise-images | Debian 10 | Beta | >= 3.3 | | Debian 11 | Beta | >= 3.3 | | Debian 12 | Beta | >= 3.3 | -| OL8 | Beta | >= 3.5 | -| OL9 | Beta | >= 3.5 | +| OL8 | Alpha | >= 3.5 | +| OL9 | Alpha | >= 3.5 | | RHEL 7 | EOL | >= 2.3 | | RHEL 8 | Stable | >= 2.7 | | RHEL 9 | Beta | >= 3.3 | @@ -37,6 +37,7 @@ Read more about how [custom images](https://maas.io/docs/how-to-customise-images ### Maturity level * Templates marked as *EOL* are OSes that are no longer supported by the upstream maintainer, and **are not recommended for new deployments**. These systems don't receive security updates and mirrors can become permanently offline at any moment. +* *Alpha* templates require packages that are not yet generally available, e.g. an unreleased MAAS or Curtin version. These should not be used in production environments. * *Beta* templates should work but we still don't have enough successful deployment reports to regard it as *Stable*. ### Output