From a32d1f2092a6455edd2f4289f68ab3430f9779dd Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 8 Aug 2016 18:28:30 -0500 Subject: [PATCH] qtuning the HA mode of cluster to respond for apis. Change-Id: I070b62f063ec6ecb1ea7501139dfcf1c34593a42 Signed-off-by: Narinder Gupta --- ci/config_tpl/bundle_tpl/ceilometer.yaml | 4 ++++ ci/config_tpl/bundle_tpl/cinder.yaml | 10 +++++++--- ci/config_tpl/bundle_tpl/glance.yaml | 4 ++++ ci/config_tpl/bundle_tpl/keystone.yaml | 4 ++++ ci/config_tpl/bundle_tpl/mysql.yaml | 7 +++++-- ci/config_tpl/bundle_tpl/neutron-api.yaml | 10 +++++++--- ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml | 10 +++++++--- ci/config_tpl/bundle_tpl/openstack-dashboard.yaml | 4 ++++ 8 files changed, 42 insertions(+), 11 deletions(-) diff --git a/ci/config_tpl/bundle_tpl/ceilometer.yaml b/ci/config_tpl/bundle_tpl/ceilometer.yaml index 031551a5..66c24c88 100644 --- a/ci/config_tpl/bundle_tpl/ceilometer.yaml +++ b/ci/config_tpl/bundle_tpl/ceilometer.yaml @@ -7,6 +7,10 @@ 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 4c1b8623..175c67e4 100644 --- a/ci/config_tpl/bundle_tpl/cinder.yaml +++ b/ci/config_tpl/bundle_tpl/cinder.yaml @@ -2,14 +2,18 @@ charm: "local:{{ ubuntu.release }}/cinder" 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 %} os-public-hostname: api.{{ opnfv.domain }} {% endif %} block-device: None glance-api-version: 2 -{% if os.ha.mode == 'ha' %} - vip: {{ opnfv.vip.cinder }} -{% endif %} to: {% for unit_id in to_select() %} - "lxc:nodes={{ unit_id }}" diff --git a/ci/config_tpl/bundle_tpl/glance.yaml b/ci/config_tpl/bundle_tpl/glance.yaml index 84999326..31f9c3b5 100644 --- a/ci/config_tpl/bundle_tpl/glance.yaml +++ b/ci/config_tpl/bundle_tpl/glance.yaml @@ -3,6 +3,10 @@ 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 24f5b102..05df44d5 100644 --- a/ci/config_tpl/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/bundle_tpl/keystone.yaml @@ -5,6 +5,10 @@ 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/mysql.yaml b/ci/config_tpl/bundle_tpl/mysql.yaml index 110140e9..afa45193 100644 --- a/ci/config_tpl/bundle_tpl/mysql.yaml +++ b/ci/config_tpl/bundle_tpl/mysql.yaml @@ -2,8 +2,11 @@ charm: "local:{{ ubuntu.release }}/percona-cluster" num_units: {{ unit_qty() }} options: - innodb-buffer-pool-size: 100M - #lp1366997-workaround: true +{% if os.ha.mode == 'ha' %} + innodb-buffer-pool-size: 10G +{% else %} + innodb-buffer-pool-size: 1G +{% endif %} max-connections: 20000 root-password: {{ get_password('mysql_root') }} sst-password: {{ get_password('mysql_sst') }} diff --git a/ci/config_tpl/bundle_tpl/neutron-api.yaml b/ci/config_tpl/bundle_tpl/neutron-api.yaml index 9ee914ae..321c2e87 100644 --- a/ci/config_tpl/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/bundle_tpl/neutron-api.yaml @@ -3,6 +3,13 @@ num_units: {{ unit_qty() }} options: 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: "*" {% if os.network.dvr %} @@ -14,9 +21,6 @@ flat-network-providers: "*" manage-neutron-plugin-legacy-mode: False {% endif %} -{% if os.ha.mode == 'ha' %} - vip: {{ opnfv.vip.neutron }} -{% endif %} {% if os.beta.public_api %} os-public-hostname: api.{{ opnfv.domain }} {% endif %} diff --git a/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml index bdf1090a..497ef29d 100644 --- a/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml +++ b/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml @@ -5,13 +5,17 @@ #console-access-protocol: novnc 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 %} console-proxy-ip: {{ opnfv.domain }} {% endif %} network-manager: Neutron -{% if os.ha.mode == 'ha' %} - vip: {{ opnfv.vip.nova }} -{% endif %} {% if os.beta.public_api %} os-public-hostname: api.{{ opnfv.domain }} {% endif %} diff --git a/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml index 83408dcd..8d604751 100644 --- a/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml +++ b/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml @@ -5,6 +5,10 @@ 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 %} -- 2.16.6