From 18ac5bcf2be8d8bdbfd5066ef25d57c3c36725e1 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 11 Aug 2016 05:30:57 -0500 Subject: 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/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 +++++++++++ 8 files changed, 11 insertions(+), 28 deletions(-) (limited to 'ci/config_tpl') 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 %} -- cgit 1.2.3-korg