Skip to content

Commit 17b4804

Browse files
committed
Zed configuration changes
This commit includes three changes. The first is a change to requirements.yml to no longer consider python versions < 3.8 The second addes a note to the container image build workflow regarding changes to labelling that may affect it. The third updates references to ``ironic_pxe`` to ``ironic_tftp``.
1 parent 58dc844 commit 17b4804

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.github/workflows/stackhpc-container-image-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@ jobs:
198198
path: ${{ matrix.distro }}-container-images
199199
retention-days: 7
200200

201+
# NOTE(Alex-Welsh) This may not work after the zed release, since the
202+
# kolla_version tag is changing to be a sha-1 hash if images are built
203+
# with kolla from a git repository
201204
- name: Prune local Kolla container images over 1 week old
202205
run: |
203206
sudo docker image prune --all --force --filter until=168h --filter="label=kolla_version"

etc/kayobe/ironic.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@
9797
# Name of the Neutron network to use for provisioning.
9898
#kolla_ironic_provisioning_network:
9999

100-
# List of default kernel parameters to append for baremetal PXE boot.
101-
#kolla_ironic_pxe_append_params_default:
100+
# List of default kernel parameters to append for baremetal PXE (TFTP) boot.
101+
#kolla_ironic_tftp_append_params_default:
102102

103-
# List of additional kernel parameters to append for baremetal PXE boot.
104-
#kolla_ironic_pxe_append_params_extra:
103+
# List of additional kernel parameters to append for baremetal PXE (TFTP) boot.
104+
#kolla_ironic_tftp_append_params_extra:
105105

106-
# List of kernel parameters to append for baremetal PXE boot.
107-
#kolla_ironic_pxe_append_params:
106+
# List of kernel parameters to append for baremetal PXE (TFTP) boot.
107+
#kolla_ironic_tftp_append_params:
108108

109109
###############################################################################
110110
# Ironic Node Configuration

etc/kayobe/kolla.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,6 @@ kolla_enable_grafana: true
625625
#kolla_enable_influxdb:
626626
#kolla_enable_ironic:
627627
#kolla_enable_ironic_neutron_agent:
628-
#kolla_enable_ironic_pxe_uefi:
629628
#kolla_enable_iscsid:
630629
#kolla_enable_keepalived:
631630
#kolla_enable_keystone:

etc/kayobe/pulp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@ stackhpc_pulp_images_kolla:
10471047
- ironic-conductor
10481048
- ironic-inspector
10491049
- ironic-neutron-agent
1050-
- ironic-pxe
1050+
- ironic-tftp
10511051
- iscsid
10521052
- keepalived
10531053
- keystone

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/zed
2-
ansible-modules-hashivault@git+https://github.com/stackhpc/ansible-modules-hashivault@stackhpc;python_version < "3.8"
32
ansible-modules-hashivault;python_version >= "3.8"

0 commit comments

Comments
 (0)