From 06248c2f1eebf57d1b51c906b0ca5b3b4c432246 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 8 Jan 2019 08:08:19 -0600 Subject: [PATCH] Worker Node Personality Libvirt Change for Libvirt the "compute" personality to "worker". Story: 2004022 Task: 28799 Depends-On: https://review.openstack.org/#/c/628341 Change-Id: Icba19b252b22765c7f64990fd92af19cb748fd6a Signed-off-by: Abraham Arce --- deployment/libvirt/README.rst | 2 +- deployment/libvirt/destroy_configuration.sh | 10 +++++----- deployment/libvirt/setup_configuration.sh | 10 +++++----- deployment/libvirt/{compute.xml => worker.xml} | 0 4 files changed, 11 insertions(+), 11 deletions(-) rename deployment/libvirt/{compute.xml => worker.xml} (100%) diff --git a/deployment/libvirt/README.rst b/deployment/libvirt/README.rst index 69f71a1b..8d6c8603 100644 --- a/deployment/libvirt/README.rst +++ b/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 diff --git a/deployment/libvirt/destroy_configuration.sh b/deployment/libvirt/destroy_configuration.sh index 624a1ba8..16edd46c 100755 --- a/deployment/libvirt/destroy_configuration.sh +++ b/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 diff --git a/deployment/libvirt/setup_configuration.sh b/deployment/libvirt/setup_configuration.sh index a149bcea..7c1c1bc5 100755 --- a/deployment/libvirt/setup_configuration.sh +++ b/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 diff --git a/deployment/libvirt/compute.xml b/deployment/libvirt/worker.xml similarity index 100% rename from deployment/libvirt/compute.xml rename to deployment/libvirt/worker.xml