starlingx
/
tools
Code Issues Proposed changes

Merge "Worker Node Personality Libvirt"

This commit is contained in:
Zuul 2019-01-28 22:11:13 +00:00 committed by Gerrit Code Review
parent e149c057e0 06248c2f1e
commit 116c6701b1
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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
an interactive shell that configures everything. Here's an example:: an interactive shell that configures everything. Here's an example::
export CONTROLLER=madcloud export CONTROLLER=madcloud
export COMPUTE=madnode export WORKER=madnode
export BRIDGE_INTERFACE=madbr export BRIDGE_INTERFACE=madbr
export EXTERNAL_NETWORK=172.30.20.0/24 export EXTERNAL_NETWORK=172.30.20.0/24
export EXTERNAL_IP=172.30.20.1/24 export EXTERNAL_IP=172.30.20.1/24

10
deployment/libvirt/destroy_configuration.sh
View File

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

10
deployment/libvirt/setup_configuration.sh
View File

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

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