From: Dan Radez <dradez@redhat.com>
Date: Tue, 31 May 2016 12:21:17 +0000 (+0000)
Subject: Merge "adding control of number of virtual compute nodes"
X-Git-Tag: colorado.1.0~213
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=079f0d3bc65ea1289c3c46b1881f8693810a5cd9;p=apex.git

Merge "adding control of number of virtual compute nodes"
---

079f0d3bc65ea1289c3c46b1881f8693810a5cd9
diff --cc ci/deploy.sh
index 639fd0f6,a3b17baf..b99a5693
--- a/ci/deploy.sh
+++ b/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"