From 18ac5bcf2be8d8bdbfd5066ef25d57c3c36725e1 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 11 Aug 2016 05:30:57 -0500 Subject: [PATCH] to adjust the worker mutiplier for api service so that not too many instance of API service spawned up. Change-Id: Ia1d5b542c3f97cbdc7b5523fc8d45b90ed836aa2 Signed-off-by: Narinder Gupta --- ci/02-deploybundle.sh | 18 ++++++++++++++++++ ci/config_tpl/bundle_tpl/ceilometer.yaml | 4 ---- ci/config_tpl/bundle_tpl/cinder.yaml | 4 ---- ci/config_tpl/bundle_tpl/glance.yaml | 4 ---- ci/config_tpl/bundle_tpl/keystone.yaml | 4 ---- ci/config_tpl/bundle_tpl/neutron-api.yaml | 4 ---- ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml | 4 ---- ci/config_tpl/bundle_tpl/openstack-dashboard.yaml | 4 ---- ci/config_tpl/bundle_tpl/phase2-overrides.yaml | 11 +++++++++++ ci/default_deployment_config.yaml | 3 +++ ci/deploy.sh | 2 +- 11 files changed, 33 insertions(+), 29 deletions(-) diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index 12c58fc5..22d44970 100755 --- a/ci/02-deploybundle.sh +++ b/ci/02-deploybundle.sh @@ -52,6 +52,24 @@ if [ -e ~/.juju/deployment.yaml ]; then cephdisk=`grep "ceph-disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'` osdomname=`grep "os-domain-name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'` fi + + workmutiple=`maas maas nodes list | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '` + max=0 + for v in ${workmutiple[@]}; do + if (( $v > $max )); then max=$v; fi; + done + echo $max + + if [ "$max" -lt 8 ];then + workmutiple=1 + elif [ "$max" -lt 32 ]; then + workmutiple=0.25 + elif [ "$max" -lt 72 ]; then + workmutiple=0.1 + else + workmutiple=0.05 + fi + sed -i "s/worker-multiplier: 2/worker-multiplier: ${workmutiple}/g" default_deployment_config.yaml fi case "$opnfvlab" in diff --git a/ci/config_tpl/bundle_tpl/ceilometer.yaml b/ci/config_tpl/bundle_tpl/ceilometer.yaml index 66c24c88..031551a5 100644 --- a/ci/config_tpl/bundle_tpl/ceilometer.yaml +++ b/ci/config_tpl/bundle_tpl/ceilometer.yaml @@ -7,10 +7,6 @@ num_units: {{ unit_qty() }} options: {% if os.ha.mode == 'ha' %} - haproxy-server-timeout: 10000 - haproxy-client-timeout: 10000 - haproxy-queue-timeout: 10000 - haproxy-connect-timeout: 10000 vip: {{ opnfv.vip.ceilometer }} {% endif %} {% if os.beta.public_api %} diff --git a/ci/config_tpl/bundle_tpl/cinder.yaml b/ci/config_tpl/bundle_tpl/cinder.yaml index 175c67e4..4c417472 100644 --- a/ci/config_tpl/bundle_tpl/cinder.yaml +++ b/ci/config_tpl/bundle_tpl/cinder.yaml @@ -3,10 +3,6 @@ num_units: {{ unit_qty() }} options: {% if os.ha.mode == 'ha' %} - haproxy-server-timeout: 10000 - haproxy-client-timeout: 10000 - haproxy-queue-timeout: 10000 - haproxy-connect-timeout: 10000 vip: {{ opnfv.vip.cinder }} {% endif %} {% if os.beta.public_api %} diff --git a/ci/config_tpl/bundle_tpl/glance.yaml b/ci/config_tpl/bundle_tpl/glance.yaml index 31f9c3b5..84999326 100644 --- a/ci/config_tpl/bundle_tpl/glance.yaml +++ b/ci/config_tpl/bundle_tpl/glance.yaml @@ -3,10 +3,6 @@ num_units: {{ unit_qty() }} options: {% if os.ha.mode == 'ha' %} - haproxy-server-timeout: 10000 - haproxy-client-timeout: 10000 - haproxy-queue-timeout: 10000 - haproxy-connect-timeout: 10000 vip: {{ opnfv.vip.glance }} {% endif %} {% if os.beta.public_api %} diff --git a/ci/config_tpl/bundle_tpl/keystone.yaml b/ci/config_tpl/bundle_tpl/keystone.yaml index 05df44d5..24f5b102 100644 --- a/ci/config_tpl/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/bundle_tpl/keystone.yaml @@ -5,10 +5,6 @@ admin-password: {{ opnfv.admin_password | default(os.admin.password) }} admin-token: {{ os.admin.name }} {% if os.ha.mode == 'ha' %} - haproxy-server-timeout: 10000 - haproxy-client-timeout: 10000 - haproxy-queue-timeout: 10000 - haproxy-connect-timeout: 10000 vip: {{ opnfv.vip.keystone }} {% endif %} {% if os.beta.public_api %} diff --git a/ci/config_tpl/bundle_tpl/neutron-api.yaml b/ci/config_tpl/bundle_tpl/neutron-api.yaml index 321c2e87..4de6e07e 100644 --- a/ci/config_tpl/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/bundle_tpl/neutron-api.yaml @@ -5,10 +5,6 @@ neutron-security-groups: true {% if os.ha.mode == 'ha' %} vip: {{ opnfv.vip.neutron }} - haproxy-server-timeout: 10000 - haproxy-client-timeout: 10000 - haproxy-queue-timeout: 10000 - haproxy-connect-timeout: 10000 {% endif %} {% if os.network.controller == 'nosdn' %} flat-network-providers: "*" diff --git a/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml index 497ef29d..88e3f730 100644 --- a/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml +++ b/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml @@ -6,10 +6,6 @@ neutron-external-network: ext-net service-guard: true {% if os.ha.mode == 'ha' %} - haproxy-server-timeout: 10000 - haproxy-client-timeout: 10000 - haproxy-queue-timeout: 10000 - haproxy-connect-timeout: 10000 vip: {{ opnfv.vip.nova }} {% endif %} {% if opnfv.domain is defined %} diff --git a/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml index 8d604751..83408dcd 100644 --- a/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml +++ b/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml @@ -5,10 +5,6 @@ secret: admin webroot: / {% if os.ha.mode == 'ha' %} - haproxy-server-timeout: 10000 - haproxy-client-timeout: 10000 - haproxy-queue-timeout: 10000 - haproxy-connect-timeout: 10000 vip: {{ opnfv.vip.dashboard }} {% endif %} {% if os.beta.public_api %} diff --git a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml index 33350300..ebefeab7 100644 --- a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml +++ b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml @@ -4,6 +4,17 @@ {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} +{% if os.ha.mode == 'ha' %} +{% if os.api.haproxy_timeout %} + haproxy-server-timeout: {{ os.api.haproxy_timeout }} + haproxy-client-timeout: {{ os.api.haproxy_timeout }} + haproxy-queue-timeout: {{ os.api.haproxy_timeout }} + haproxy-connect-timeout: {{ os.api.haproxy_timeout }} +{% endif %} +{% endif %} +{% if os.api.worker_multiplier %} + worker-multiplier: {{ os.api.worker_multiplier }} +{% endif %} {% if os.network.dvr %} enable-dvr: true {% endif %} diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml index fe5b669b..4b941a71 100644 --- a/ci/default_deployment_config.yaml +++ b/ci/default_deployment_config.yaml @@ -7,6 +7,9 @@ os: cluster_size: 3 lxd: False region: RegionOne + api: + worker_multiplier: 2 + haproxy_timeout: 10000 admin: role: admin name: admin diff --git a/ci/deploy.sh b/ci/deploy.sh index 15aa60e5..2e575898 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -152,7 +152,7 @@ check_status() { status=`juju action do heat/0 domain-setup` echo $status juju expose ceph-radosgw - juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"' + #juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"' echo "...... deployment finishing ......." } -- 2.16.6