From edf35e6c820e613ae73999189ed7e4b98c3a4e7d Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Sun, 5 Feb 2017 07:49:30 -0600
Subject: increasing the mysql max connection to accomodate buffer size.

Change-Id: Ic7d2ba8717289cd8ec5e3cca32b209b1f69cae33
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/01-bootstrap.sh                        | 2 +-
 ci/03-maasdeploy.sh                       | 5 +----
 ci/config_tpl/juju2/bundle_tpl/mysql.yaml | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'ci')

diff --git a/ci/01-bootstrap.sh b/ci/01-bootstrap.sh
index 1577f49f..b02b83d3 100755
--- a/ci/01-bootstrap.sh
+++ b/ci/01-bootstrap.sh
@@ -18,5 +18,5 @@ if [[ "$jujuver" < "2" ]]; then
 else
   controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployment.yaml`
   cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployment.yaml`
-  juju bootstrap --config agent-version=2.1-beta4 $controllername $cloudname --debug --to bootstrap.maas
+  juju bootstrap $controllername $cloudname --debug --to bootstrap.maas
 fi
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 425116c2..5f973fd0 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -15,14 +15,11 @@ sudo apt-add-repository ppa:maas/stable -y
 sudo apt-add-repository cloud-archive:newton -y
 sudo apt-get update -y
 #sudo apt-get dist-upgrade -y
-sudo apt-get install openssh-server bzr git virtinst qemu-kvm libvirt-bin \
+sudo apt-get install openssh-server bzr git virtinst qemu-kvm libvirt-bin juju \
              maas maas-region-controller python-pip python-psutil python-openstackclient \
              python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass \
              openssh-server vlan ipmitool jq -y
 
-wget https://launchpad.net/~juju/+archive/ubuntu/devel/+files/juju-2.0_2.1~beta4-0ubuntu1~16.04.1~juju1_amd64.deb
-sudo dpkg -i juju-2.0_2.1~beta4-0ubuntu1~16.04.1~juju1_amd64.deb
-
 sudo pip install --upgrade pip
 
 #first parameter should be custom and second should be either
diff --git a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
index 30cc4050..d6276a5d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
@@ -12,7 +12,7 @@
 {% else %}
         innodb-buffer-pool-size: 1G
 {% endif %}
-        max-connections: 2000
+        max-connections: 4000
         root-password: {{ get_password('mysql_root') }}
         sst-password: {{ get_password('mysql_sst') }}
 {% if os.network.ipv6 %}
-- 
cgit 1.2.3-korg