summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-28 22:11:13 +0000
committerGerrit Code Review <review@openstack.org>2019-01-28 22:11:13 +0000
commit116c6701b15b9660f3c6cb7c5dd0c67db09df2b7 (patch)
tree27887295a61cab8462e577e3d47370c5ddbd8800
parente149c057e0d35db9568096c87241e5a6ef17a734 (diff)
parent06248c2f1eebf57d1b51c906b0ca5b3b4c432246 (diff)
Merge "Worker Node Personality Libvirt"
-rw-r--r--deployment/libvirt/README.rst2
-rwxr-xr-xdeployment/libvirt/destroy_configuration.sh10
-rwxr-xr-xdeployment/libvirt/setup_configuration.sh10
-rw-r--r--deployment/libvirt/worker.xml (renamed from deployment/libvirt/compute.xml)0
4 files changed, 11 insertions, 11 deletions
diff --git a/deployment/libvirt/README.rst b/deployment/libvirt/README.rst
index 69f71a1..8d6c860 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
23an interactive shell that configures everything. Here's an example:: 23an interactive shell that configures everything. Here's an example::
24 24
25 export CONTROLLER=madcloud 25 export CONTROLLER=madcloud
26 export COMPUTE=madnode 26 export WORKER=madnode
27 export BRIDGE_INTERFACE=madbr 27 export BRIDGE_INTERFACE=madbr
28 export EXTERNAL_NETWORK=172.30.20.0/24 28 export EXTERNAL_NETWORK=172.30.20.0/24
29 export EXTERNAL_IP=172.30.20.1/24 29 export EXTERNAL_IP=172.30.20.1/24
diff --git a/deployment/libvirt/destroy_configuration.sh b/deployment/libvirt/destroy_configuration.sh
index 624a1ba..16edd46 100755
--- a/deployment/libvirt/destroy_configuration.sh
+++ b/deployment/libvirt/destroy_configuration.sh
@@ -31,11 +31,11 @@ DOMAIN_DIRECTORY=vms
31destroy_controller ${CONFIGURATION} ${CONTROLLER} 31destroy_controller ${CONFIGURATION} ${CONTROLLER}
32 32
33if ([ "$CONFIGURATION" == "controllerstorage" ] || [ "$CONFIGURATION" == "dedicatedstorage" ]); then 33if ([ "$CONFIGURATION" == "controllerstorage" ] || [ "$CONFIGURATION" == "dedicatedstorage" ]); then
34 COMPUTE=${COMPUTE:-compute} 34 WORKER=${WORKER:-worker}
35 COMPUTE_NODES_NUMBER=${COMPUTE_NODES_NUMBER:-1} 35 WORKER_NODES_NUMBER=${WORKER_NODES_NUMBER:-1}
36 for ((i=0; i<=$COMPUTE_NODES_NUMBER; i++)); do 36 for ((i=0; i<=$WORKER_NODES_NUMBER; i++)); do
37 COMPUTE_NODE=${CONFIGURATION}-${COMPUTE}-${i} 37 WORKER_NODE=${CONFIGURATION}-${WORKER}-${i}
38 destroy_node "compute" $COMPUTE_NODE 38 destroy_node "worker" $WORKER_NODE
39 done 39 done
40fi 40fi
41 41
diff --git a/deployment/libvirt/setup_configuration.sh b/deployment/libvirt/setup_configuration.sh
index a149bce..7c1c1bc 100755
--- a/deployment/libvirt/setup_configuration.sh
+++ b/deployment/libvirt/setup_configuration.sh
@@ -30,8 +30,8 @@ configuration_check ${CONFIGURATION}
30CONFIGURATION=${CONFIGURATION:-simplex} 30CONFIGURATION=${CONFIGURATION:-simplex}
31BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr} 31BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr}
32CONTROLLER=${CONTROLLER:-controller} 32CONTROLLER=${CONTROLLER:-controller}
33COMPUTE=${COMPUTE:-compute} 33WORKER=${WORKER:-worker}
34COMPUTE_NODES_NUMBER=${COMPUTE_NODES_NUMBER:-1} 34WORKER_NODES_NUMBER=${WORKER_NODES_NUMBER:-1}
35STORAGE=${STORAGE:-storage} 35STORAGE=${STORAGE:-storage}
36STORAGE_NODES_NUMBER=${STORAGE_NODES_NUMBER:-1} 36STORAGE_NODES_NUMBER=${STORAGE_NODES_NUMBER:-1}
37DOMAIN_DIRECTORY=vms 37DOMAIN_DIRECTORY=vms
@@ -43,9 +43,9 @@ bash ${SCRIPT_DIR}/destroy_configuration.sh -c $CONFIGURATION
43create_controller $CONFIGURATION $CONTROLLER $BRIDGE_INTERFACE $ISOIMAGE 43create_controller $CONFIGURATION $CONTROLLER $BRIDGE_INTERFACE $ISOIMAGE
44 44
45if ([ "$CONFIGURATION" == "controllerstorage" ] || [ "$CONFIGURATION" == "dedicatedstorage" ]); then 45if ([ "$CONFIGURATION" == "controllerstorage" ] || [ "$CONFIGURATION" == "dedicatedstorage" ]); then
46 for ((i=0; i<=$COMPUTE_NODES_NUMBER; i++)); do 46 for ((i=0; i<=$WORKER_NODES_NUMBER; i++)); do
47 COMPUTE_NODE=${CONFIGURATION}-${COMPUTE}-${i} 47 WORKER_NODE=${CONFIGURATION}-${WORKER}-${i}
48 create_node "compute" ${COMPUTE_NODE} ${BRIDGE_INTERFACE} 48 create_node "worker" ${WORKER_NODE} ${BRIDGE_INTERFACE}
49 done 49 done
50fi 50fi
51 51
diff --git a/deployment/libvirt/compute.xml b/deployment/libvirt/worker.xml
index d1f9291..d1f9291 100644
--- a/deployment/libvirt/compute.xml
+++ b/deployment/libvirt/worker.xml