summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/03-maasdeploy.sh6
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/mysql.yaml5
2 files changed, 8 insertions, 3 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index c0226bcb..2e26e928 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -395,18 +395,22 @@ addnodes(){
fi
}
+#configure MAAS with the different options.
configuremaas
+
if [ "$virtinstall" -eq 1 ]; then
enablesubnetanddhcp
fi
+sleep 60
+
#reconfigure maas with correct MAAS address.
#Below code is needed as MAAS have issue in commisoning without restart.
sudo ./maas-reconfigure-rack.sh $MAAS_IP
sudo ./maas-reconfigure-region.sh $MAAS_IP
# lets sleep for around 5 more minutes to make sure all images are in sync.
-sleep 300
+sleep 240
#lets add the nodes now. Currently works only for virtual deploymnet.
addnodes
diff --git a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
index e5626a75..dd455f0d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
@@ -8,11 +8,12 @@
{% endif %}
options:
{% if os.ha.mode == 'ha' %}
- innodb-buffer-pool-size: 1G
+ innodb-buffer-pool-size: 16M
+ max-connections: 200
{% else %}
innodb-buffer-pool-size: 1G
-{% endif %}
max-connections: 4000
+{% endif %}
#performance-schema: true
#source: "deb http://repo.percona.com/apt xenial main"
#key: "8507EFA5"