Merge "Worker Node Personality Libvirt"

deployment/libvirt/README.rst

@@ -23,7 +23,7 @@ The simplest way to handle this is to keep an rc file that can be sourced into
 an interactive shell that configures everything.  Here's an example::
 
 	export CONTROLLER=madcloud
-	export COMPUTE=madnode
+	export WORKER=madnode
 	export BRIDGE_INTERFACE=madbr
 	export EXTERNAL_NETWORK=172.30.20.0/24
 	export EXTERNAL_IP=172.30.20.1/24

deployment/libvirt/destroy_configuration.sh

@@ -31,11 +31,11 @@ DOMAIN_DIRECTORY=vms
 destroy_controller ${CONFIGURATION} ${CONTROLLER}
 
 if ([ "$CONFIGURATION" == "controllerstorage" ] || [ "$CONFIGURATION" == "dedicatedstorage" ]); then
-    COMPUTE=${COMPUTE:-compute}
-    COMPUTE_NODES_NUMBER=${COMPUTE_NODES_NUMBER:-1}
-    for ((i=0; i<=$COMPUTE_NODES_NUMBER; i++)); do
-        COMPUTE_NODE=${CONFIGURATION}-${COMPUTE}-${i}
-        destroy_node "compute" $COMPUTE_NODE
+    WORKER=${WORKER:-worker}
+    WORKER_NODES_NUMBER=${WORKER_NODES_NUMBER:-1}
+    for ((i=0; i<=$WORKER_NODES_NUMBER; i++)); do
+        WORKER_NODE=${CONFIGURATION}-${WORKER}-${i}
+        destroy_node "worker" $WORKER_NODE
     done
 fi
 

deployment/libvirt/setup_configuration.sh

@@ -30,8 +30,8 @@ configuration_check ${CONFIGURATION}
 CONFIGURATION=${CONFIGURATION:-simplex}
 BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr}
 CONTROLLER=${CONTROLLER:-controller}
-COMPUTE=${COMPUTE:-compute}
-COMPUTE_NODES_NUMBER=${COMPUTE_NODES_NUMBER:-1}
+WORKER=${WORKER:-worker}
+WORKER_NODES_NUMBER=${WORKER_NODES_NUMBER:-1}
 STORAGE=${STORAGE:-storage}
 STORAGE_NODES_NUMBER=${STORAGE_NODES_NUMBER:-1}
 DOMAIN_DIRECTORY=vms
@@ -43,9 +43,9 @@ bash ${SCRIPT_DIR}/destroy_configuration.sh -c $CONFIGURATION
 create_controller $CONFIGURATION $CONTROLLER $BRIDGE_INTERFACE $ISOIMAGE
 
 if ([ "$CONFIGURATION" == "controllerstorage" ] || [ "$CONFIGURATION" == "dedicatedstorage" ]); then
-    for ((i=0; i<=$COMPUTE_NODES_NUMBER; i++)); do
-        COMPUTE_NODE=${CONFIGURATION}-${COMPUTE}-${i}
-        create_node "compute" ${COMPUTE_NODE} ${BRIDGE_INTERFACE}
+    for ((i=0; i<=$WORKER_NODES_NUMBER; i++)); do
+        WORKER_NODE=${CONFIGURATION}-${WORKER}-${i}
+        create_node "worker" ${WORKER_NODE} ${BRIDGE_INTERFACE}
     done
 fi