Skip to content

Commit 4c3a178

Browse files
authored
Update metal3-dev-env hash (#1841)
Bump Ansible version to align with metal3-dev-env requirements.
1 parent bed38e9 commit 4c3a178

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

01_install_requirements.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ if [ -z "${METAL3_DEV_ENV}" ]; then
1919
# TODO -- come up with a plan for continuously updating this
2020
# Note we only do this in the case where METAL3_DEV_ENV is
2121
# unset, to enable developer testing of local checkouts
22-
git reset cb83ca7ae9cfabe827d7a784b28e537e098070ae --hard
22+
git reset 61f66daf873de7fc1eb296ea015ee3f7ff289f75 --hard
2323

2424
popd
2525
fi
2626

2727
# This must be aligned with the metal3-dev-env pinned version above, see
2828
# https://github.com/metal3-io/metal3-dev-env/blob/master/lib/common.sh
29-
export ANSIBLE_VERSION=${ANSIBLE_VERSION:-"8.0.0"}
29+
export ANSIBLE_VERSION=${ANSIBLE_VERSION:-"8.7.0"}
3030

3131
# Speed up dnf downloads
3232
sudo sh -c "echo 'fastestmirror=1' >> /etc/dnf/dnf.conf"
@@ -145,7 +145,7 @@ else
145145
echo "Using yq from $(which yq)"
146146
fi
147147

148-
GO_VERSION=${GO_VERSION:-1.22.3}
148+
GO_VERSION=${GO_VERSION:-1.24.10}
149149
GO_CUSTOM_MIRROR=${GO_CUSTOM_MIRROR:-"https://go.dev/dl"}
150150

151151
GOARCH=$(uname -m)

vm_setup_vars.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,28 @@ flavors:
1919
disk: "{{ lookup('env', 'MASTER_DISK') }}"
2020
vcpu: "{{ lookup('env', 'MASTER_VCPU') }}"
2121
extradisks: "{{ lookup('env', 'VM_EXTRADISKS') | default(false) }}"
22+
architecture: "{{ libvirt_arch }}"
2223

2324
arbiter:
2425
memory: "{{ lookup('env', 'ARBITER_MEMORY') }}"
2526
disk: "{{ lookup('env', 'ARBITER_DISK') }}"
2627
vcpu: "{{ lookup('env', 'ARBITER_VCPU') }}"
2728
extradisks: "{{ lookup('env', 'VM_EXTRADISKS') | default(false) }}"
29+
architecture: "{{ libvirt_arch }}"
2830

2931
worker:
3032
memory: "{{ lookup('env', 'WORKER_MEMORY') }}"
3133
disk: "{{ lookup('env', 'WORKER_DISK') }}"
3234
vcpu: "{{ lookup('env', 'WORKER_VCPU') }}"
3335
extradisks: "{{ lookup('env', 'VM_EXTRADISKS') | default(false) }}"
36+
architecture: "{{ libvirt_arch }}"
3437

3538
extraworker:
3639
memory: "{{ lookup('env', 'EXTRA_WORKER_MEMORY') }}"
3740
disk: "{{ lookup('env', 'EXTRA_WORKER_DISK') }}"
3841
vcpu: "{{ lookup('env', 'EXTRA_WORKER_VCPU') }}"
3942
extradisks: "{{ lookup('env', 'VM_EXTRADISKS') | default(false) }}"
43+
architecture: "{{ libvirt_arch }}"
4044

4145
# For OpenShift we create some additional DNS records for the API/DNS VIPs
4246
baremetal_network_cidr_v4: "{{ lookup('env', 'EXTERNAL_SUBNET_V4') }}"

0 commit comments

Comments
 (0)