Merge "adding control of number of virtual compute nodes"
authorDan Radez <dradez@redhat.com>
Tue, 31 May 2016 12:21:17 +0000 (12:21 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 31 May 2016 12:21:17 +0000 (12:21 +0000)
1  2 
ci/deploy.sh

diff --cc ci/deploy.sh
@@@ -38,13 -37,13 +37,15 @@@ declare -A NET_MA
  
  SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null -o LogLevel=error)
  DEPLOY_OPTIONS=""
 -RESOURCES=${RESOURCES:-'/var/opt/opnfv/images'}
  CONFIG=${CONFIG:-'/var/opt/opnfv'}
 +RESOURCES=${RESOURCES:-"$CONFIG/images"}
 +LIB=${LIB:-"$CONFIG/lib"}
  OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network"
 +
  VM_CPUS=4
  VM_RAM=8
+ VM_COMPUTES=2
  # Netmap used to map networks to OVS bridge names
  NET_MAP['admin_network']="br-admin"
  NET_MAP['private_network']="br-private"