Commit ea1ad48c authored by Dan Radez's avatar Dan Radez Committed by Gerrit Code Review
Browse files

Merge "correcting the virtual baremetal defaults"

parents 5805f11f 9c776d55
......@@ -45,7 +45,7 @@ OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_networ
VM_CPUS=4
VM_RAM=8
VM_COMPUTES=2
VM_COMPUTES=1
# Netmap used to map networks to OVS bridge names
NET_MAP['admin_network']="br-admin"
......
......@@ -180,7 +180,7 @@ EOI
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml"
# scale compute nodes according to inventory
total_nodes=$(ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "cat /home/stack/instackenv.json | grep -c memory")
total_nodes=$(ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "grep -c memory /home/stack/instackenv.json")
# check if HA is enabled
if [[ "$ha_enabled" == "True" ]]; then
......
......@@ -30,19 +30,19 @@ EOF
# next create the virtual machines and add their definitions to the file
if [ "$ha_enabled" == "False" ]; then
# 1 controller + computes
# zero based so just pass compute count
vm_index=$VM_COMPUTES
controller_index=0
else
controller_index=2
# 3 controller + computes
# zero based so add 2 to compute count
vm_index=$((2+$VM_COMPUTES))
if [ $VM_COMPUTES -lt 2 ]; then
VM_COMPUTES=2
fi
fi
for i in $(seq 0 $vm_index); do
if [ "$VM_COMPUTES" -gt 0 ]; then
for i in $(seq 0 $(($controller_index+$VM_COMPUTES))); do
if [ $i -gt $controller_index ]; then
capability="profile:compute"
VM_COMPUTES=$((VM_COMPUTES - 1))
else
capability="profile:control"
if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "$ramsize" -lt 10240 ]]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment