aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-07-13 16:35:25 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-07-13 16:43:55 +0400
commit08e52d4ee0e5ecb6caf033a9ecfbb762c98d400e (patch)
tree35c04f2088c8521b647998d07f11a62baa277605 /ci
parentd676c91a67684a7efb317d58429c49db7c562473 (diff)
Tune network sysctl options
* tune net/tcp opts * handle vcpus setting for vms * fix tempest issue with public subnets visible * set reclass data source to local to avoid git clone Change-Id: Ibac9eba8234ebb20854c03b399405968cb2069e8 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index f98246d3d..a1f5e386b 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -244,10 +244,12 @@ source lib.sh
eval $(parse_yaml ../config/defaults.yaml)
eval $(parse_yaml ../config/${DEPLOY_SCENARIO}.yaml)
-declare -A virtual_nodes_ram
+declare -A virtual_nodes_ram virtual_nodes_vcpus
for node in "${virtual_nodes[@]}"; do
virtual_custom_ram="virtual_${node}_ram"
+ virtual_custom_vcpus="virtual_${node}_vcpus"
virtual_nodes_ram[$node]=${!virtual_custom_ram:-$virtual_default_ram}
+ virtual_nodes_vcpus[$node]=${!virtual_custom_vcpus:-$virtual_default_vcpus}
done
export CLUSTER_DOMAIN=$cluster_domain
@@ -259,7 +261,7 @@ export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i
generate_ssh_key
prepare_vms virtual_nodes $base_image
create_networks
-create_vms virtual_nodes virtual_nodes_ram
+create_vms virtual_nodes virtual_nodes_ram virtual_nodes_vcpus
update_pxe_network
start_vms virtual_nodes
check_connection