hybrid_deployment tigon28

fix issue in dev_scripts openshift-metal3/dev-scripts#1621
mnietoji · Feb 5, 2024 · 4fd0c84 · 4fd0c84
1 parent 9da64e4
commit 4fd0c84
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/roles/devscripts/files/yq.patch b/roles/devscripts/files/yq.patch
@@ -0,0 +1,13 @@
+diff --git a/01_install_requirements.sh b/01_install_requirements.sh
+index 4303ba2..53e3335 100755
+--- a/01_install_requirements.sh
++++ b/01_install_requirements.sh
+@@ -99,7 +99,7 @@ esac
+ # during dnf upgrade
+ sudo dnf -y install jq
+ sudo python -m pip install yq
+-yq -iy '.[3].dnf.nobest = "true"' ${METAL3_DEV_ENV_PATH}/vm-setup/roles/packages_installation/tasks/centos_required_packages.yml
++yq -i '.[3].dnf.nobest = "true"' ${METAL3_DEV_ENV_PATH}/vm-setup/roles/packages_installation/tasks/centos_required_packages.yml
+
+ GOARCH=$(uname -m)
+ if [[ $GOARCH == "aarch64" ]]; then
diff --git a/roles/devscripts/tasks/sub_tasks/31_repo.yml b/roles/devscripts/tasks/sub_tasks/31_repo.yml
@@ -39,6 +39,13 @@
     src: virtproxyd.patch
     dest: "{{ cifmw_devscripts_repo_dir }}/02_configure_host.sh"
 
+- name: Patch  yq command
+  tags:
+    - bootstrap
+  ansible.posix.patch:
+    src: yq.patch
+    dest: "{{ cifmw_devscripts_repo_dir }}/01_install_requirements.sh"
+
 - name: Read the vm_setup_vars contents.
   ansible.builtin.slurp:
     src: "{{ cifmw_devscripts_repo_dir }}/vm_setup_vars.yml"