Extending PDF and IDF of Ericsson pod2 to all nodes

[kuberef.git] / functions.sh

diff --git a/functions.sh b/functions.sh
index fd19209..47c8536 100755 (executable)
--- a/functions.sh
+++ b/functions.sh
@@ -10,10 +10,10 @@
 
 # Clean up
 clean_up() {
-    if sudo virsh list --all | grep "${VM_NAME}.*running" ; then
+    if sudo virsh list --all | grep " ${VM_NAME} .*running" ; then
         sudo virsh destroy "$VM_NAME"
     fi
-    if sudo virsh list --all | grep "${VM_NAME}" ; then
+    if sudo virsh list --all | grep " ${VM_NAME} " ; then
         sudo virsh undefine "$VM_NAME"
     fi
     sudo rm -rf "/var/lib/libvirt/images/$VM_NAME"
@@ -141,26 +141,27 @@ provision_k8s() {
     # shellcheck disable=SC2087
     ssh -o StrictHostKeyChecking=no -tT "$USERNAME"@"$(get_vm_ip)" << EOF
 # Install BMRA
-if [ ! -d "${PROJECT_ROOT}/container-experience-kits" ]; then
+if ! command -v docker; then
     curl -fsSL https://get.docker.com/ | sh
     printf "Waiting for docker service..."
     until sudo docker info; do
         printf "."
         sleep 2
     done
-    git clone https://github.com/intel/container-experience-kits.git
-    cd ${PROJECT_ROOT}/container-experience-kits
-    git checkout v1.4.1
-    git submodule update --init
-    cp -r examples/group_vars examples/host_vars .
-    cp ${PROJECT_ROOT}/${INSTALLER}/inventory.ini \
+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/
-    cp ${PROJECT_ROOT}/${INSTALLER}/all.yml \
+cp ${PROJECT_ROOT}/${INSTALLER}/all.yml \
     ${PROJECT_ROOT}/container-experience-kits/group_vars/
-    cp ${PROJECT_ROOT}/${INSTALLER}/node1.yml \
+cp ${PROJECT_ROOT}/${INSTALLER}/node1.yml \
     ${PROJECT_ROOT}/container-experience-kits/host_vars/
-fi
-sudo service docker start
 sudo docker run --rm \
 -v ${PROJECT_ROOT}/container-experience-kits:/bmra \
 -v ~/.ssh/:/root/.ssh/ rihabbanday/bmra-install:centos \