Skip to content
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.

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

Fix ol makefiles #185

Merged
merged 2 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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 |
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ol8/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ol8/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
```

Expand Down
3 changes: 1 addition & 2 deletions ol9/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ol9/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
```

Expand Down