From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 15 Feb 2017 11:03:30 +0000 (-0600)
Subject: to correct mysql error.
X-Git-Tag: danube.1.0~37
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F28705%2F1;p=joid.git

to correct mysql error.

Change-Id: I4b03bf8f61b24ad622cee449ed6febd4f97f2c9d
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
index df655eac..5c0fee6c 100644
--- a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
@@ -8,8 +8,8 @@
 {% endif %}
       options:
 {% if os.ha.mode == 'ha' %}
-        innodb-buffer-pool-size: 128M
-        max-connections: 600
+        innodb-buffer-pool-size: 1G
+        max-connections: 4000
 {% else %}
         innodb-buffer-pool-size: 1G
         max-connections: 4000
@@ -19,6 +19,7 @@
         #key: "8507EFA5"
         root-password: {{ get_password('mysql_root') }}
         sst-password: {{ get_password('mysql_sst') }}
+        sst-method: rsync
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml
index 74a9b88b..29a5f405 100644
--- a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml
@@ -23,6 +23,7 @@
 {% if opnfv.storage_dict.ceph is defined %}
         ceph-osd-replication-count: {{ unit_ceph_qty() }}
 {% endif %}
+{% if os.beta.huge_pages %}
         hugepages: "2048"
 {% endif %}
 {% if os.beta.cpu_pin %}