diff options
| author |   Carlos Goncalves <carlos.goncalves@neclab.eu> | 2016-08-01 12:03:02 +0200 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2016-08-03 10:25:17 -0400 |
| commit | 2e9b552d5efe383ce08ff48a9739031f28251013 (patch) | |
| tree | 176a2624d7dad402d84832633811190b55669d14 /lib | |
| parent | 31b10ea2994fc4d6614c0a31b0f54dbd58dc7abc (diff) | |
Build Congress RPM package
Changes include:
- RPM build for congress moved into Apex
- Fixes missing log dir for congress in spec
- Adds missing API network definition for Congress
- Fixes URL for getting doctor driver
- Increases controller default RAM to 10GB due to resource contention
with ODL
- Fixes Congress service config/db sync in THT to be in step 3
opnfv-tht-pr: 51
JIRA: APEX-212
Change-Id: I4a55646e7ef851782ae0d1963f7b479086958365
Signed-off-by: Carlos Goncalves <carlos.goncalves@neclab.eu>
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/virtual-setup-functions.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/virtual-setup-functions.sh b/lib/virtual-setup-functions.sh index e7410da7..ed4d4dfd 100755 --- a/lib/virtual-setup-functions.sh +++ b/lib/virtual-setup-functions.sh @@ -40,6 +40,17 @@ EOF fi for i in $(seq 0 $vm_index); do + if [ "$VM_COMPUTES" -gt 0 ]; then + capability="profile:compute" + VM_COMPUTES=$((VM_COMPUTES - 1)) + else + capability="profile:control" + if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "$ha_enabled" == "True" && "$ramsize" -lt 10240 ]]; then + echo "WARN: RAM per controller too low. OpenDaylight specified in HA deployment requires at least 10GB" + echo "INFO: Increasing RAM per controller to 10GB" + ramsize=10240 + fi + fi if ! virsh list --all | grep baremetal${i} > /dev/null; then define_vm baremetal${i} network 41 'admin_network' $vcpus $ramsize for n in private_network public_network storage_network api_network; do @@ -54,13 +65,6 @@ EOF #virsh vol-list default | grep baremetal${i} 2>&1> /dev/null || virsh vol-create-as default baremetal${i}.qcow2 41G --format qcow2 mac=$(virsh domiflist baremetal${i} | grep admin_network | awk '{ print $5 }') - if [ "$VM_COMPUTES" -gt 0 ]; then - capability="profile:compute" - VM_COMPUTES=$((VM_COMPUTES - 1)) - else - capability="profile:control" - fi - cat >> $CONFIG/instackenv-virt.json << EOF { "pm_addr": "192.168.122.1", |