Commit 9794df1
committed
Align quadlet templates with ephemeral HTTPS/file-ISO changes
The ironic-https branch added HTTPS vmedia support and file:// boot ISO
sourcing to the ephemeral container path but the quadlet templates (used
by the persistent phase-7 path) were not updated.
- metal3-ironic-api.container.j2: add /iso volume bind-mount,
OS_CONDUCTOR__FILE_URL_ALLOWED_PATHS=/iso, and conditional
ironic-vmedia-cert/key secrets + VMEDIA_TLS_PORT/IRONIC_EXTERNAL_IP
env vars when ironic_https_configured is true
- metal3-httpd.container.j2: add unconditional VMEDIA_TLS_PORT=6183
and conditional ironic-vmedia-cert/key secrets
- deploy_ironic.yaml: add become: metal3_persistent to the two vmedia
secret creation tasks so they land in the root podman secret store
when running the persistent/quadlet path
Signed-off-by: Rafa Porres Molina <rporresm@redhat.com>
Assisted-by: Claude Sonnet 4.6 <noreply@anthropic.com>1 parent cd62773 commit 9794df1
3 files changed
Lines changed: 17 additions & 0 deletions
File tree
- playbooks
- tasks
- templates/quadlets
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
| 100 | + | |
100 | 101 | | |
101 | 102 | | |
102 | 103 | | |
| |||
107 | 108 | | |
108 | 109 | | |
109 | 110 | | |
| 111 | + | |
110 | 112 | | |
111 | 113 | | |
112 | 114 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
12 | 16 | | |
13 | 17 | | |
| 18 | + | |
14 | 19 | | |
15 | 20 | | |
16 | 21 | | |
| |||
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
18 | 23 | | |
19 | 24 | | |
20 | 25 | | |
| |||
23 | 28 | | |
24 | 29 | | |
25 | 30 | | |
| 31 | + | |
26 | 32 | | |
27 | 33 | | |
28 | 34 | | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
29 | 39 | | |
30 | 40 | | |
31 | 41 | | |
| |||
0 commit comments