Update check of libvirt(d) group

[kuberef.git] / functions.sh

diff --git a/functions.sh b/functions.sh
index 1229d32..26db3c6 100755 (executable)
--- a/functions.sh
+++ b/functions.sh
@@ -49,6 +49,14 @@ check_prerequisites() {
         exit 1
     fi
 
+    #-------------------------------------------------------------------------------
+    # Check is yq is installed
+    #-------------------------------------------------------------------------------
+    if ! command -v yq &> /dev/null; then
+        echo "ERROR : yq not found. Please install."
+        exit 1
+    fi
+
     #-------------------------------------------------------------------------------
     # Check is libvirt is installed
     #-------------------------------------------------------------------------------
@@ -66,7 +74,7 @@ check_prerequisites() {
     if [ "${ID,,}" == "ubuntu" ] && [ "$VERSION_ID" == "16.04" ]; then
         libvirt_group+="d"
     fi
-    if ! groups | grep " $libvirt_group "; then
+    if ! groups | grep "$libvirt_group"; then
         echo "ERROR : $(id -nu) user doesn't belong to $libvirt_group group."
         exit 1
     fi
@@ -164,18 +172,17 @@ if ! command -v docker; then
 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,host_vars} ${PROJECT_ROOT}/container-experience-kits/
+    cp -r ${PROJECT_ROOT}/container-experience-kits/examples/group_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
+        ${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,kube-node.yml} \
     ${PROJECT_ROOT}/container-experience-kits/group_vars/
-cp ${PROJECT_ROOT}/${INSTALLER}/node1.yml \
-    ${PROJECT_ROOT}/container-experience-kits/host_vars/
 sudo docker run --rm \
+-e ANSIBLE_CONFIG=/bmra/ansible.cfg \
 -v ${PROJECT_ROOT}/container-experience-kits:/bmra \
 -v ~/.ssh/:/root/.ssh/ rihabbanday/bmra-install:centos \
 ansible-playbook -i /bmra/inventory.ini /bmra/playbooks/cluster.yml