Extending PDF and IDF of Ericsson pod2 to all nodes

[kuberef.git] / functions.sh

diff --git a/functions.sh b/functions.sh
index 55edfbf..47c8536 100755 (executable)
--- a/functions.sh
+++ b/functions.sh
@@ -46,7 +46,8 @@ EOL
 # Create VM
     sudo genisoimage  -output "/var/lib/libvirt/images/$VM_NAME/$VM_NAME-cidata.iso" \
         -volid cidata -joliet -rock user-data meta-data
-
+    sudo virt-customize -a "/var/lib/libvirt/images/$VM_NAME/$VM_NAME.qcow2" \
+        --root-password password:"$ROOT_PASSWORD"
     sudo virt-install --connect qemu:///system --name "$VM_NAME" \
         --ram 4096 --vcpus=4 --os-type linux --os-variant ubuntu16.04 \
         --disk path="/var/lib/libvirt/images/$VM_NAME/$VM_NAME.qcow2",format=qcow2 \
@@ -104,7 +105,7 @@ copy_files_jump() {
 # Host Provisioning
 provision_hosts() {
     # shellcheck disable=SC2087
-    ssh -tT "$USERNAME"@"$(get_vm_ip)" << EOF
+    ssh -o StrictHostKeyChecking=no -tT "$USERNAME"@"$(get_vm_ip)" << EOF
 # Install and run cloud-infra
 if [ ! -d "${PROJECT_ROOT}/engine" ]; then
     ssh-keygen -t rsa -N "" -f ${PROJECT_ROOT}/.ssh/id_rsa
@@ -127,7 +128,7 @@ setup_network() {
     WORKER_IP=$(yq r "$CURRENTPATH"/hw_config/"$VENDOR"/pdf.yaml nodes.[1].interfaces.["$PXE_IF_INDEX"].address)
 # SSH to jumphost
     # shellcheck disable=SC2087
-    ssh -tT  "$USERNAME"@"$(get_vm_ip)" << EOF
+    ssh -o StrictHostKeyChecking=no -tT "$USERNAME"@"$(get_vm_ip)" << EOF
 ssh -o StrictHostKeyChecking=no root@$MASTER_IP \
     'bash -s' <  ${PROJECT_ROOT}/${VENDOR}/setup_network.sh
 ssh -o StrictHostKeyChecking=no root@$WORKER_IP \
@@ -138,28 +139,29 @@ EOF
 # k8s Provisioning (currently BMRA)
 provision_k8s() {
     # shellcheck disable=SC2087
-    ssh -tT  "$USERNAME"@"$(get_vm_ip)" << EOF
+    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 \