Skip to content

Commit f593daa

Browse files
committed
hybrid_deployment tigon28
fix issue in dev_scripts openshift-metal3/dev-scripts#1621
1 parent fec5767 commit f593daa

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

roles/devscripts/files/yq.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/01_install_requirements.sh b/01_install_requirements.sh
2+
index 4303ba2..53e3335 100755
3+
--- a/01_install_requirements.sh
4+
+++ b/01_install_requirements.sh
5+
@@ -99,7 +99,7 @@ esac
6+
# during dnf upgrade
7+
sudo dnf -y install jq
8+
sudo python -m pip install yq
9+
-yq -iy '.[3].dnf.nobest = "true"' ${METAL3_DEV_ENV_PATH}/vm-setup/roles/packages_installation/tasks/centos_required_packages.yml
10+
+yq -i '.[3].dnf.nobest = "true"' ${METAL3_DEV_ENV_PATH}/vm-setup/roles/packages_installation/tasks/centos_required_packages.yml
11+
12+
GOARCH=$(uname -m)
13+
if [[ $GOARCH == "aarch64" ]]; then

roles/devscripts/tasks/sub_tasks/31_repo.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
3939
src: virtproxyd.patch
4040
dest: "{{ cifmw_devscripts_repo_dir }}/02_configure_host.sh"
4141

42+
- name: Patch yq command
43+
tags:
44+
- bootstrap
45+
ansible.posix.patch:
46+
src: yq.patch
47+
dest: "{{ cifmw_devscripts_repo_dir }}/01_install_requirements.sh"
48+
4249
- name: Read the vm_setup_vars contents.
4350
ansible.builtin.slurp:
4451
src: "{{ cifmw_devscripts_repo_dir }}/vm_setup_vars.yml"

0 commit comments

Comments
 (0)