From: Rihab Banday <rihab.banday@ericsson.com>
Date: Fri, 21 Aug 2020 13:03:34 +0000 (+0200)
Subject: Fix PyYAML error caused by net-attach-defs-create role in BMRA
X-Git-Tag: opnfv-10.0.0~20
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kuberef.git;a=commitdiff_plain;h=5864692345fe35db4ced3b208dbbc2b143525259

Fix PyYAML error caused by net-attach-defs-create role in BMRA

This change modifies net-attach-defs-create role to fix PyYAML
errors discovered during installation of openshift package on
remote nodes.

Change-Id: I45d9fef77942b8bec0bfc5fb50d8be53c96adb75
Signed-off-by: Rihab Banday <rihab.banday@ericsson.com>
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/70839
Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Reviewed-by: Georg Kunz <georg.kunz@est.tech>
---

diff --git a/functions.sh b/functions.sh
index d246ace..47c8536 100755
--- a/functions.sh
+++ b/functions.sh
@@ -152,6 +152,9 @@ fi
 if [ ! -d "${PROJECT_ROOT}/container-experience-kits" ]; then
     git clone --recurse-submodules --depth 1 https://github.com/intel/container-experience-kits.git -b v1.4.1 ${PROJECT_ROOT}/container-experience-kits/
     cp -r ${PROJECT_ROOT}/container-experience-kits/examples/group_vars examples/host_vars ${PROJECT_ROOT}/container-experience-kits/
+#TODO Remove this once the reported issue is fixed in the next BMRA Release
+    sed -i '/\openshift/a \    extra_args: --ignore-installed PyYAML' \
+         ${PROJECT_ROOT}/container-experience-kits/roles/net-attach-defs-create/tasks/main.yml
 fi
 cp ${PROJECT_ROOT}/${INSTALLER}/inventory.ini \
     ${PROJECT_ROOT}/container-experience-kits/