Large update which includes the following
- The introduction of a tools container which can be expanded as
necessary. It connects to voltha and kafka networks
- The introduction of the envoy proxy container
- The addition of an option to the CreateInstaller.sh script to rebuild
the voltha VM to pick up any new code changes
- A fix to work around a dpkg issue where it didn't handle depnedencies
propoerly
- Addition of start and stop scripts for the voltha suite and the use of
those scripts by the installer. The old per service start eliminated
from the installer
- Increased the number of vCPUs used by the installer and the voltha VM
to speed up installer creation.
Note the envoy proxy has not been integrated into the voltha suite yet,
this commit adds the container and some preliminary configuration but
integration of the proxy will be committed in a subsequent update.
Addressed comments from the reviewers
Change-Id: I5475f110ba955631baf05b0e34aa6a934ca69a24
diff --git a/install/CreateInstaller.sh b/install/CreateInstaller.sh
index 4a79b37..b9ae71a 100755
--- a/install/CreateInstaller.sh
+++ b/install/CreateInstaller.sh
@@ -13,6 +13,7 @@
# Command line argument variables
testMode="no"
+rebuildVoltha="no"
@@ -38,6 +39,10 @@
testMode="yes"
echo -e "${lBlue}Test mode is ${green}enabled${NC}"
;;
+ "rebuild" )
+ rebuildVoltha="yes"
+ echo -e "${lBlue}Voltha rebuild is ${green}enabled${NC}"
+ ;;
esac
done
}
@@ -231,9 +236,12 @@
# Ensure that the voltha VM is running so that images can be secured
echo -e "${lBlue}Ensure that the ${lCyan}voltha VM${lBlue} is running${NC}"
-vVM=`virsh list | grep voltha_voltha${uId}`
+vVm=`virsh list | grep "voltha_voltha${uId}"`
+#echo "vVm: $vVm"
+#echo "rebuildVoltha: $rebuildVoltha"
-if [ -z "$vVM" ]; then
+
+if [ -z "$vVm" -o "$rebuildVoltha" == "yes" ]; then
if [ "$testMode" == "yes" ]; then
./BuildVoltha.sh $1
rtrn=$?