diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-08-23 02:37:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-23 02:37:42 +0000 |
| commit | ea1ad48ca5f4ec391b4232fa92ba027119ad2ca7 (patch) | |
| tree | 9cbf6fd0fc86fce734d4f0ce35610d22ceafc082 | |
| parent | 5805f11fb10b474b9e6bf8bf31f2bea2806174a2 (diff) | |
| parent | 9c776d55e9f69de416823acff52017e9ea6ca5a8 (diff) | |
Merge "correcting the virtual baremetal defaults"
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 2 | ||||
| -rwxr-xr-x | lib/virtual-setup-functions.sh | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 71433683..91663dfc 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -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" diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index df17750b..ab8086b5 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -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 diff --git a/lib/virtual-setup-functions.sh b/lib/virtual-setup-functions.sh index abff25e4..903e3bcd 100755 --- a/lib/virtual-setup-functions.sh +++ b/lib/virtual-setup-functions.sh @@ -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 |