diff options
| -rw-r--r-- | INFO | 7 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 2 | ||||
| -rw-r--r-- | build/variables.sh | 10 | ||||
| -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 |
6 files changed, 19 insertions, 18 deletions
@@ -20,8 +20,9 @@ IRC: Server:freenode.net Channel:#opnfv-apex Repository: apex Committers: -dradez@redhat.com -trozet@redhat.com -michapma@redhat.com +Dan Radez (dradez@redhat.com) +Tim Rozet (trozet@redhat.com) +Michael Chapman (michapma@redhat.com) +Feng Pan (fpan@redhat.com) Link to TSC approval of the project: http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-14-14.00.html diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index e7f1dd7d..bce99437 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -46,7 +46,7 @@ pushd images > /dev/null dpdk_pkg_str='' for package in ${dpdk_rpms[@]}; do - curl -O "$dpdk_uri_base/$package" + wget "$dpdk_uri_base/$package" dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms" done diff --git a/build/variables.sh b/build/variables.sh index fda735cd..1cca352d 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -18,11 +18,11 @@ doctor_driver=https://raw.githubusercontent.com/openstack/congress/master/congre dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv dpdk_rpms=( -'ovs4opnfv-32930523-dpdk-16.04.0-1.el7.centos.x86_64.rpm' -'ovs4opnfv-32930523-dpdk-devel-16.04.0-1.el7.centos.x86_64.rpm' -'ovs4opnfv-32930523-dpdk-examples-16.04.0-1.el7.centos.x86_64.rpm' -'ovs4opnfv-32930523-dpdk-tools-16.04.0-1.el7.centos.x86_64.rpm' -'ovs4opnfv-32930523-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm' +'ovs4opnfv-55ef39e7-dpdk-16.04.0-1.el7.centos.x86_64.rpm' +'ovs4opnfv-55ef39e7-dpdk-devel-16.04.0-1.el7.centos.x86_64.rpm' +'ovs4opnfv-55ef39e7-dpdk-examples-16.04.0-1.el7.centos.x86_64.rpm' +'ovs4opnfv-55ef39e7-dpdk-tools-16.04.0-1.el7.centos.x86_64.rpm' +'ovs4opnfv-55ef39e7-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm' ) ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm 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 |