Browse Source

Merge "Worker Node Personality Libvirt"

Zuul 2 months ago
parent
commit
116c6701b1

+ 1
- 1
deployment/libvirt/README.rst View File

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

+ 5
- 5
deployment/libvirt/destroy_configuration.sh View File

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

+ 5
- 5
deployment/libvirt/setup_configuration.sh View File

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

deployment/libvirt/compute.xml → deployment/libvirt/worker.xml View File


Loading…
Cancel
Save