Removing mycnf static files from contrib.

implements bp guestagent-mycnf-versioning

Change-Id: I4ad06d165b47be49841a83de2d1d229cd7561775

18 files changed, 0 insertions, 1852 deletions

diff --git a/contrib/dbaas-mycnf/builddeb.sh b/contrib/dbaas-mycnf/builddeb.sh
deleted file mode 100755
index 9bc3acc6..00000000
--- a/contrib/dbaas-mycnf/builddeb.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# Build the debian package for my.cnf templates
-
-# chdir to the script dir
-self="${0#./}"
-base="${self%/*}"
-current=`pwd`
-
-if [ "$base" = "$self" ] ; then
-    home=$current
-elif [[ $base =~ ^/ ]]; then
-    home="$base"
-else
-    home="$current/$base"
-fi
-
-cd $home
-
-# Setup the build directory for building the package
-build_dir="build"
-rm -rf $build_dir
-mkdir -p $build_dir
-cp -R debian $build_dir
-cp -R etc $build_dir
-
-cd $build_dir
-
-# Define the various templates
-MEMSIZE=( "512M:1" "1024M:2" "2048M:4" "4096M:8" "8192M:16" "16384M:32" "32768M:64" )
-
-# Create the individual templates from the master template
-for i in "${MEMSIZE[@]}"; do
-    key=${i%%:*}
-    multiplier=${i##*:}
-    cat ../etc/my.cnf.base | while read line; do
-        if [[ `expr "$line" : ".*{.*}"` != "0" ]]; then
-            oldval=`echo $line | sed -e 's/.*{\(.*\)}.*/\1/'`
-            prop=`echo $line | sed -e 's/^\(.*\) = {100}/\1/'`
-            if [[ $prop == "max_connections" ]]; then
-                newval=`echo "($oldval * $multiplier) + 10" | bc`
-            else
-                newval=`echo "$oldval * $multiplier" | bc`
-            fi
-            line=`echo $line | sed -e "s/{$oldval}/$newval/"`
-        fi
-        echo $line >> etc/my.cnf.$key
-    done
-done
-
-# Build the package
-DEB_BUILD_OPTIONS=nocheck,nodocs dpkg-buildpackage -rfakeroot -b -uc -us -d
diff --git a/contrib/dbaas-mycnf/debian/changelog b/contrib/dbaas-mycnf/debian/changelog
deleted file mode 100644
index c897c2c4..00000000
--- a/contrib/dbaas-mycnf/debian/changelog
+++ /dev/null
@@ -1,64 +0,0 @@
-dbaas-mycnf (1.0-8) lucid; urgency=low
-
-  [ Nirmal Ranganathan ]
-  * Generating all the flavor templates by default
-
- -- DBaaS-Dev <dbaas-dev@rackspace.com>  Wed, 08 Feb 2012 17:00:27 +0600
-
-dbaas-mycnf (1.0-7) lucid; urgency=low
-
-  [ Nirmal Ranganathan ]
-  * Changing the error logs back to /var/log/mysql/mysqld.log
-
- -- DBaaS-Dev <dbaas-dev@rackspace.com>  Thu, 07 Apr 2011 17:00:27 +0600
-
-dbaas-mycnf (1.0-6) lucid; urgency=low
-
-  [ Nirmal Ranganathan ]
-  * Changing mysql bin logs location to /var/lib/mysql, same as the mysql data
-    directory
-  * Setting query_cache_type=1
-
- -- DBaaS-Dev <dbaas-dev@rackspace.com>  Wed, 23 Mar 2011 10:24:27 +0600
-
-dbaas-mycnf (1.0-5) lucid; urgency=low
-
-  [ Nirmal Ranganathan ]
-  * Moved the replacing the templates part to a post install script
-  * Added the bc depends
-  * Added a build_templates script to build out the various flavored tempaltes
-    which could be used for testing purposes to verify working of post install
-
- -- DBaaS-Dev <dbaas-dev@rackspace.com>  Mon, 21 Mar 2011 14:02:27 +0600
-
-dbaas-mycnf (1.0-4) lucid; urgency=low
-
-  [ Nirmal Ranganathan ]
-  * Re-tagging due to build failure and broken package if rebuilt with the
-    same tag
-
- -- DBaaS-Dev <dbaas-dev@rackspace.com>  Fri, 18 Mar 2011 13:51:27 +0600
-
-dbaas-mycnf (1.0-3) lucid; urgency=low
-
-  [ Nirmal Ranganathan ]
-  * Created a base template which is for 512M container
-  * Generated my.cnf for 512M to 32G containers
-
- -- DBaaS-Dev <dbaas-dev@rackspace.com>  Fri, 18 Mar 2011 11:51:27 +0600
-
-dbaas-mycnf (1.0-2) lucid; urgency=low
-
-  [ Nirmal Ranganathan ]
-  * Update my.cnf.default to ideal values, still some values are for 256M and
-    needs to be updated
-
- -- DBaaS-Dev <dbaas-dev@rackspace.com>  Thu, 17 Mar 2011 16:32:03 +0600
-
-dbaas-mycnf (1.0-1) lucid; urgency=low
-
-  [ Nirmal Ranganathan ]
-  * Created the initial default my.cnf template
-
- -- DBaaS-Dev <dbaas-dev@rackspace.com>  Fri, 11 Mar 2011 14:32:03 +0600
-
diff --git a/contrib/dbaas-mycnf/debian/control b/contrib/dbaas-mycnf/debian/control
deleted file mode 100644
index 9cc63ebf..00000000
--- a/contrib/dbaas-mycnf/debian/control
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: dbaas-mycnf
-Priority: extra
-Maintainer: DBaaS-Dev <dbaas-dev@rackspace.com>
-Standards-Version: 3.9.1
-
-
-Package: dbaas-mycnf
-Architecture: all
-Provides: dbaas-mycnf
-Section: utils
-Depends: bc
-Description: my.cnf tempaltes for Database as a Service.
- Contains various mysql configuration templates for use within
- Database as a Service. 
-
diff --git a/contrib/dbaas-mycnf/debian/copyright b/contrib/dbaas-mycnf/debian/copyright
deleted file mode 100644
index 84f7c016..00000000
--- a/contrib/dbaas-mycnf/debian/copyright
+++ /dev/null
@@ -1,24 +0,0 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: dbaas-mycnf
-Source: local
-
-Files: *
-Copyright: 2010 OpenStack Foundation
-Copyright: Others (See individual files for more details)
-License: Apache-2
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
-    http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian-based systems the full text of the Apache version 2.0 license
- can be found in `/usr/share/common-licenses/Apache-2.0'.
-
-
diff --git a/contrib/dbaas-mycnf/debian/dbaas-mycnf.install b/contrib/dbaas-mycnf/debian/dbaas-mycnf.install
deleted file mode 100644
index 6485817e..00000000
--- a/contrib/dbaas-mycnf/debian/dbaas-mycnf.install
+++ /dev/null
@@ -1 +0,0 @@
-etc/*my.cnf* /etc/dbaas/my.cnf/
diff --git a/contrib/dbaas-mycnf/debian/dbaas-mycnf.lintian-overrides b/contrib/dbaas-mycnf/debian/dbaas-mycnf.lintian-overrides
deleted file mode 100644
index 7c0b0213..00000000
--- a/contrib/dbaas-mycnf/debian/dbaas-mycnf.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-dbaas-mycnf: no-upstream-changelog
diff --git a/contrib/dbaas-mycnf/debian/dbaas-mycnf.postinst b/contrib/dbaas-mycnf/debian/dbaas-mycnf.postinst
deleted file mode 100644
index 8993648b..00000000
--- a/contrib/dbaas-mycnf/debian/dbaas-mycnf.postinst
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash -e
-
-# Get the multiplier based on the memvalue
-mem=`cat /proc/meminfo | grep MemTotal | awk '{print $2/524288}'`
-base_cutoff="0.7"
-
-ceil() {
-    awk -vnumber="$mem" '
-        function ceiling(x){return (x == int(x)) ? x : int(x)+1 }
-        BEGIN{ print ceiling(number) }'
-}
-
-multiplier=`ceil`
-
-# If the mem is less than base_cutoff which is 512MB, just use
-# the default which is for anything less than 512MB
-if [[ $mem < $base_cutoff ]]; then
-   exit 0
-fi
-
-MYSQL_CONF_DIR="/etc/dbaas/my.cnf"
-
-# Create the individual templates from the master template
-if [ -e "$MYSQL_CONF_DIR/my.cnf.base" ]; then
-    cat $MYSQL_CONF_DIR/my.cnf.base | while read line; do
-        if [[ `expr "$line" : ".*{.*}"` != "0" ]]; then
-            oldval=`echo $line | sed -e 's/.*{\(.*\)}.*/\1/'`
-            if [[ $prop == "max_connections" ]]; then
-                newval=`echo "($oldval * $multiplier) + 10" | bc`
-            else
-                newval=`echo "$oldval * $multiplier" | bc`
-            fi
-            line=`echo $line | sed -e "s/{$oldval}/$newval/"`
-        fi
-        echo $line >> $MYSQL_CONF_DIR/my.cnf.default.tmp
-    done
-    mv $MYSQL_CONF_DIR/my.cnf.default.tmp $MYSQL_CONF_DIR/my.cnf.default
-fi
-
-
-#DEBHELPER#
diff --git a/contrib/dbaas-mycnf/debian/rules b/contrib/dbaas-mycnf/debian/rules
deleted file mode 100755
index 72ae4909..00000000
--- a/contrib/dbaas-mycnf/debian/rules
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/make -f
-
-# Verbose mode
-#export DH_VERBOSE=1
-
-%:
-	dh $@
-
diff --git a/contrib/dbaas-mycnf/etc/my.cnf.base b/contrib/dbaas-mycnf/etc/my.cnf.base
deleted file mode 100644
index 2e9e87ac..00000000
--- a/contrib/dbaas-mycnf/etc/my.cnf.base
+++ /dev/null
@@ -1,181 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# Basic Settings
-#
-
-#
-# IMPORTANT
-# If you make changes to these settings and your system uses apparmor, you may
-# also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-user = mysql
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-####tmpdir = /tmp
-tmpdir = /var/tmp
-pid_file = /var/run/mysqld/mysqld.pid
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address = 127.0.0.1
-#
-# Fine Tuning
-#
-####key_buffer = 16M
-key_buffer_size = {50}M
-####max_allowed_packet = 16M
-max_allowed_packet = {1}M
-thread_stack = 192K
-####thread_cache_size = 8
-thread_cache_size = {4}
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover = BACKUP
-#max_connections = 100
-#table_cache = 64
-#thread_concurrency = 10
-#
-# Query Cache Configuration
-#
-
-# Q cache
-query_cache_type = 1
-#query_cache_min_res_unit = 1024
-query_cache_limit = 1M
-####query_cache_size = 16M
-query_cache_size = {8}M
-#
-# Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file = /var/log/mysql/mysql.log
-#general_log = 1
-
-log_error = /var/log/mysql/mysqld.log
-
-# Innodb params
-innodb_data_file_path = ibdata1:10M:autoextend
-innodb_buffer_pool_size = {150}M
-innodb_file_per_table = 1
-innodb_log_files_in_group = 2
-innodb_log_file_size=50M
-innodb_log_buffer_size=25M
-
-# Timeouts
-connect_timeout = 15
-wait_timeout = 120
-
-
-# Buffers
-join_buffer_size = 1M
-read_buffer_size = 512K
-read_rnd_buffer_size = 512K
-sort_buffer_size = 1M
-
-
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-# other settings you may need to change.
-#server-id = 1
-#log_bin = /var/lib/mysql/mysql-bin.log
-#expire_logs_days = 10
-#max_binlog_size = 100M
-
-
-# Temp table
-tmp_table_size = {16}M
-max_heap_table_size = {16}M
-
-# Table cache
-table_open_cache = {256}
-table_definition_cache = {256}
-open_files_limit = {512}
-
-# Connections limit
-max_user_connections = {100}
-max_connections = {100}
-
-# Default Storage Engine
-default_storage_engine = innodb
-
-
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-# Disable LOAD DATA LOCAL INFILE
-local-infile = 0
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-# faster start of mysql but no tab completition
-#no-auto-rehash
-
-[isamchk]
-key_buffer = 16M
-
-#
-# IMPORTANT: Additional settings that can override those from this file!
-# The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
diff --git a/contrib/dbaas-mycnf/etc/my.cnf.default b/contrib/dbaas-mycnf/etc/my.cnf.default
deleted file mode 100644
index 73c575c7..00000000
--- a/contrib/dbaas-mycnf/etc/my.cnf.default
+++ /dev/null
@@ -1,182 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-# 
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# * Basic Settings
-#
-
-#
-# * IMPORTANT
-#   If you make changes to these settings and your system uses apparmor, you may
-#   also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-user = mysql
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-####tmpdir = /tmp
-tmpdir = /var/tmp
-pid_file = /var/run/mysqld/mysqld.pid
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address = 127.0.0.1
-#
-# * Fine Tuning
-#
-####key_buffer = 16M
-key_buffer_size = 25M
-#512#key_buffer_size = 50M
-####max_allowed_packet = 16M
-max_allowed_packet = 1M
-thread_stack = 192K
-####thread_cache_size       = 8
-thread_cache_size       = 4
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover         = BACKUP
-#max_connections        = 100
-#table_cache            = 64
-#thread_concurrency     = 10
-#
-# * Query Cache Configuration
-#
-
-# Q cache
-query_cache_type        = 1
-#query_cache_min_res_unit = 1024
-query_cache_limit = 1M
-####query_cache_size        = 16M
-query_cache_size        = 8M
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file        = /var/log/mysql/mysql.log
-#general_log             = 1
-
-log_error                = /var/log/mysql/mysqld.log
-
-# Innodb params
-innodb_data_file_path = ibdata1:10M:autoextend
-innodb_buffer_pool_size = 50M
-#512#innodb_buffer_pool_size = 150M
-innodb_file_per_table = 1
-innodb_log_files_in_group = 2
-innodb_log_file_size=50M
-
-# Timeouts
-connect_timeout = 15
-wait_timeout = 120
-
-
-# Buffers
-join_buffer_size = 1M
-read_buffer_size = 512K
-read_rnd_buffer_size = 512K
-sort_buffer_size = 1M
-
-
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-#       other settings you may need to change.
-#server-id = 1
-log_bin = /var/lib/mysql/mysql-bin.log
-#### expire_logs_days =  10
-expire_logs_days = 2
-max_binlog_size         = 100M
-
-
-# Temp table
-tmp_table_size = 16M
-max_heap_table_size = 16M
-
-# Table cache
-table_open_cache = 256
-table_definition_cache = 256
-open_files_limit = 512
-
-# Connections limit
-max_user_connections = 100
-max_connections = 110
-
-# Default Storage Engine
-default_storage_engine = innodb
-
-
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-# Disable LOAD DATA LOCAL INFILE
-local-infile = 0
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-#no-auto-rehash # faster start of mysql but no tab completition
-
-[isamchk]
-key_buffer = 16M
-
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-#   The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
diff --git a/contrib/dbaas-mycnf/test/build_templates.sh b/contrib/dbaas-mycnf/test/build_templates.sh
deleted file mode 100755
index 366dbf7c..00000000
--- a/contrib/dbaas-mycnf/test/build_templates.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Define the various templates
-MEMSIZE=( "512M:1" "1G:2" "2G:4" "4G:8" "8G:16" "16G:32" "32G:64" )
-
-# Create the individual templates from the master template
-for i in "${MEMSIZE[@]}"; do
-    key=${i%%:*}
-    multiplier=${i##*:}
-    cat ../etc/my.cnf.base | while read line; do
-        if [[ `expr "$line" : ".*{.*}"` != "0" ]]; then
-            oldval=`echo $line | sed -e 's/.*{\(.*\)}.*/\1/'`
-            prop=`echo $line | sed -e 's/^\(.*\) = {100}/\1/'`
-            if [[ $prop == "max_connections" ]]; then
-                newval=`echo "($oldval * $multiplier) + 10" | bc`
-            else
-                newval=`echo "$oldval * $multiplier" | bc`
-            fi
-            line=`echo $line | sed -e "s/{$oldval}/$newval/"`
-        fi
-        echo $line >> etc/my.cnf.$key
-    done
-done
-
diff --git a/contrib/dbaas-mycnf/test/etc/my.cnf.16G b/contrib/dbaas-mycnf/test/etc/my.cnf.16G
deleted file mode 100644
index 0be15481..00000000
--- a/contrib/dbaas-mycnf/test/etc/my.cnf.16G
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# Basic Settings
-#
-
-#
-# IMPORTANT
-# If you make changes to these settings and your system uses apparmor, you may
-# also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-user = mysql
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-####tmpdir = /tmp
-tmpdir = /var/tmp
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address = 127.0.0.1
-#
-# Fine Tuning
-#
-####key_buffer = 16M
-key_buffer_size = 1600M
-####max_allowed_packet = 16M
-max_allowed_packet = 32M
-thread_stack = 192K
-####thread_cache_size = 8
-thread_cache_size = 128
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover = BACKUP
-#max_connections = 100
-#table_cache = 64
-#thread_concurrency = 10
-#
-# Query Cache Configuration
-#
-
-# Q cache
-query_cache_type = 1
-#query_cache_min_res_unit = 1024
-query_cache_limit = 1M
-####query_cache_size = 16M
-query_cache_size = 256M
-#
-# Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file = /var/log/mysql/mysql.log
-#general_log = 1
-
-log_error = /var/log/mysql/mysqld.log
-
-# Innodb params
-innodb_data_file_path = ibdata1:10M:autoextend
-innodb_buffer_pool_size = 4800M
-innodb_file_per_table = 1
-innodb_log_files_in_group = 2
-innodb_log_file_size=50M
-innodb_log_buffer_size=25M
-
-# Timeouts
-connect_timeout = 15
-wait_timeout = 120
-
-
-# Buffers
-join_buffer_size = 1M
-read_buffer_size = 512K
-read_rnd_buffer_size = 512K
-sort_buffer_size = 1M
-
-
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-# other settings you may need to change.
-#server-id = 1
-#log_bin = /var/lib/mysql/mysql-bin.log
-#expire_logs_days = 10
-#max_binlog_size = 100M
-
-
-# Temp table
-tmp_table_size = 512M
-max_heap_table_size = 512M
-
-# Table cache
-table_open_cache = 8192
-table_definition_cache = 8192
-open_files_limit = 16384
-
-# Connections limit
-max_user_connections = 3200
-max_connections = 3210
-
-# Default Storage Engine
-default_storage_engine = innodb
-
-
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-# Disable LOAD DATA LOCAL INFILE
-local-infile = 0
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-# faster start of mysql but no tab completition
-#no-auto-rehash
-
-[isamchk]
-key_buffer = 16M
-
-#
-# IMPORTANT: Additional settings that can override those from this file!
-# The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
diff --git a/contrib/dbaas-mycnf/test/etc/my.cnf.1G b/contrib/dbaas-mycnf/test/etc/my.cnf.1G
deleted file mode 100644
index 426ccbcc..00000000
--- a/contrib/dbaas-mycnf/test/etc/my.cnf.1G
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# Basic Settings
-#
-
-#
-# IMPORTANT
-# If you make changes to these settings and your system uses apparmor, you may
-# also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-user = mysql
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-####tmpdir = /tmp
-tmpdir = /var/tmp
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address = 127.0.0.1
-#
-# Fine Tuning
-#
-####key_buffer = 16M
-key_buffer_size = 100M
-####max_allowed_packet = 16M
-max_allowed_packet = 2M
-thread_stack = 192K
-####thread_cache_size = 8
-thread_cache_size = 8
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover = BACKUP
-#max_connections = 100
-#table_cache = 64
-#thread_concurrency = 10
-#
-# Query Cache Configuration
-#
-
-# Q cache
-query_cache_type = 1
-#query_cache_min_res_unit = 1024
-query_cache_limit = 1M
-####query_cache_size = 16M
-query_cache_size = 16M
-#
-# Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file = /var/log/mysql/mysql.log
-#general_log = 1
-
-log_error = /var/log/mysql/mysqld.log
-
-# Innodb params
-innodb_data_file_path = ibdata1:10M:autoextend
-innodb_buffer_pool_size = 300M
-innodb_file_per_table = 1
-innodb_log_files_in_group = 2
-innodb_log_file_size=50M
-innodb_log_buffer_size=25M
-
-# Timeouts
-connect_timeout = 15
-wait_timeout = 120
-
-
-# Buffers
-join_buffer_size = 1M
-read_buffer_size = 512K
-read_rnd_buffer_size = 512K
-sort_buffer_size = 1M
-
-
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-# other settings you may need to change.
-#server-id = 1
-#log_bin = /var/lib/mysql/mysql-bin.log
-#expire_logs_days = 10
-#max_binlog_size = 100M
-
-
-# Temp table
-tmp_table_size = 32M
-max_heap_table_size = 32M
-
-# Table cache
-table_open_cache = 512
-table_definition_cache = 512
-open_files_limit = 1024
-
-# Connections limit
-max_user_connections = 200
-max_connections = 210
-
-# Default Storage Engine
-default_storage_engine = innodb
-
-
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-# Disable LOAD DATA LOCAL INFILE
-local-infile = 0
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-# faster start of mysql but no tab completition
-#no-auto-rehash
-
-[isamchk]
-key_buffer = 16M
-
-#
-# IMPORTANT: Additional settings that can override those from this file!
-# The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
diff --git a/contrib/dbaas-mycnf/test/etc/my.cnf.2G b/contrib/dbaas-mycnf/test/etc/my.cnf.2G
deleted file mode 100644
index b3e66a9e..00000000
--- a/contrib/dbaas-mycnf/test/etc/my.cnf.2G
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# Basic Settings
-#
-
-#
-# IMPORTANT
-# If you make changes to these settings and your system uses apparmor, you may
-# also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-user = mysql
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-####tmpdir = /tmp
-tmpdir = /var/tmp
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address = 127.0.0.1
-#
-# Fine Tuning
-#
-####key_buffer = 16M
-key_buffer_size = 200M
-####max_allowed_packet = 16M
-max_allowed_packet = 4M
-thread_stack = 192K
-####thread_cache_size = 8
-thread_cache_size = 16
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover = BACKUP
-#max_connections = 100
-#table_cache = 64
-#thread_concurrency = 10
-#
-# Query Cache Configuration
-#
-
-# Q cache
-query_cache_type = 1
-#query_cache_min_res_unit = 1024
-query_cache_limit = 1M
-####query_cache_size = 16M
-query_cache_size = 32M
-#
-# Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file = /var/log/mysql/mysql.log
-#general_log = 1
-
-log_error = /var/log/mysql/mysqld.log
-
-# Innodb params
-innodb_data_file_path = ibdata1:10M:autoextend
-innodb_buffer_pool_size = 600M
-innodb_file_per_table = 1
-innodb_log_files_in_group = 2
-innodb_log_file_size=50M
-innodb_log_buffer_size=25M
-
-# Timeouts
-connect_timeout = 15
-wait_timeout = 120
-
-
-# Buffers
-join_buffer_size = 1M
-read_buffer_size = 512K
-read_rnd_buffer_size = 512K
-sort_buffer_size = 1M
-
-
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-# other settings you may need to change.
-#server-id = 1
-#log_bin = /var/lib/mysql/mysql-bin.log
-#expire_logs_days = 10
-#max_binlog_size = 100M
-
-
-# Temp table
-tmp_table_size = 64M
-max_heap_table_size = 64M
-
-# Table cache
-table_open_cache = 1024
-table_definition_cache = 1024
-open_files_limit = 2048
-
-# Connections limit
-max_user_connections = 400
-max_connections = 410
-
-# Default Storage Engine
-default_storage_engine = innodb
-
-
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-# Disable LOAD DATA LOCAL INFILE
-local-infile = 0
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-# faster start of mysql but no tab completition
-#no-auto-rehash
-
-[isamchk]
-key_buffer = 16M
-
-#
-# IMPORTANT: Additional settings that can override those from this file!
-# The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
diff --git a/contrib/dbaas-mycnf/test/etc/my.cnf.32G b/contrib/dbaas-mycnf/test/etc/my.cnf.32G
deleted file mode 100644
index 751307e4..00000000
--- a/contrib/dbaas-mycnf/test/etc/my.cnf.32G
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# Basic Settings
-#
-
-#
-# IMPORTANT
-# If you make changes to these settings and your system uses apparmor, you may
-# also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-user = mysql
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-####tmpdir = /tmp
-tmpdir = /var/tmp
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address = 127.0.0.1
-#
-# Fine Tuning
-#
-####key_buffer = 16M
-key_buffer_size = 3200M
-####max_allowed_packet = 16M
-max_allowed_packet = 64M
-thread_stack = 192K
-####thread_cache_size = 8
-thread_cache_size = 256
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover = BACKUP
-#max_connections = 100
-#table_cache = 64
-#thread_concurrency = 10
-#
-# Query Cache Configuration
-#
-
-# Q cache
-query_cache_type = 1
-#query_cache_min_res_unit = 1024
-query_cache_limit = 1M
-####query_cache_size = 16M
-query_cache_size = 512M
-#
-# Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file = /var/log/mysql/mysql.log
-#general_log = 1
-
-log_error = /var/log/mysql/mysqld.log
-
-# Innodb params
-innodb_data_file_path = ibdata1:10M:autoextend
-innodb_buffer_pool_size = 9600M
-innodb_file_per_table = 1
-innodb_log_files_in_group = 2
-innodb_log_file_size=50M
-innodb_log_buffer_size=25M
-
-# Timeouts
-connect_timeout = 15
-wait_timeout = 120
-
-
-# Buffers
-join_buffer_size = 1M
-read_buffer_size = 512K
-read_rnd_buffer_size = 512K
-sort_buffer_size = 1M
-
-
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-# other settings you may need to change.
-#server-id = 1
-#log_bin = /var/lib/mysql/mysql-bin.log
-#expire_logs_days = 10
-#max_binlog_size = 100M
-
-
-# Temp table
-tmp_table_size = 1024M
-max_heap_table_size = 1024M
-
-# Table cache
-table_open_cache = 16384
-table_definition_cache = 16384
-open_files_limit = 32768
-
-# Connections limit
-max_user_connections = 6400
-max_connections = 6410
-
-# Default Storage Engine
-default_storage_engine = innodb
-
-
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-# Disable LOAD DATA LOCAL INFILE
-local-infile = 0
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-# faster start of mysql but no tab completition
-#no-auto-rehash
-
-[isamchk]
-key_buffer = 16M
-
-#
-# IMPORTANT: Additional settings that can override those from this file!
-# The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
diff --git a/contrib/dbaas-mycnf/test/etc/my.cnf.4G b/contrib/dbaas-mycnf/test/etc/my.cnf.4G
deleted file mode 100644
index d2a35c1d..00000000
--- a/contrib/dbaas-mycnf/test/etc/my.cnf.4G
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# Basic Settings
-#
-
-#
-# IMPORTANT
-# If you make changes to these settings and your system uses apparmor, you may
-# also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-user = mysql
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-####tmpdir = /tmp
-tmpdir = /var/tmp
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address = 127.0.0.1
-#
-# Fine Tuning
-#
-####key_buffer = 16M
-key_buffer_size = 400M
-####max_allowed_packet = 16M
-max_allowed_packet = 8M
-thread_stack = 192K
-####thread_cache_size = 8
-thread_cache_size = 32
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover = BACKUP
-#max_connections = 100
-#table_cache = 64
-#thread_concurrency = 10
-#
-# Query Cache Configuration
-#
-
-# Q cache
-query_cache_type = 1
-#query_cache_min_res_unit = 1024
-query_cache_limit = 1M
-####query_cache_size = 16M
-query_cache_size = 64M
-#
-# Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file = /var/log/mysql/mysql.log
-#general_log = 1
-
-log_error = /var/log/mysql/mysqld.log
-
-# Innodb params
-innodb_data_file_path = ibdata1:10M:autoextend
-innodb_buffer_pool_size = 1200M
-innodb_file_per_table = 1
-innodb_log_files_in_group = 2
-innodb_log_file_size=50M
-innodb_log_buffer_size=25M
-
-# Timeouts
-connect_timeout = 15
-wait_timeout = 120
-
-
-# Buffers
-join_buffer_size = 1M
-read_buffer_size = 512K
-read_rnd_buffer_size = 512K
-sort_buffer_size = 1M
-
-
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-# other settings you may need to change.
-#server-id = 1
-#log_bin = /var/lib/mysql/mysql-bin.log
-#expire_logs_days = 10
-#max_binlog_size = 100M
-
-
-# Temp table
-tmp_table_size = 128M
-max_heap_table_size = 128M
-
-# Table cache
-table_open_cache = 2048
-table_definition_cache = 2048
-open_files_limit = 4096
-
-# Connections limit
-max_user_connections = 800
-max_connections = 810
-
-# Default Storage Engine
-default_storage_engine = innodb
-
-
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-# Disable LOAD DATA LOCAL INFILE
-local-infile = 0
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-# faster start of mysql but no tab completition
-#no-auto-rehash
-
-[isamchk]
-key_buffer = 16M
-
-#
-# IMPORTANT: Additional settings that can override those from this file!
-# The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
diff --git a/contrib/dbaas-mycnf/test/etc/my.cnf.512M b/contrib/dbaas-mycnf/test/etc/my.cnf.512M
deleted file mode 100644
index 38c58e20..00000000
--- a/contrib/dbaas-mycnf/test/etc/my.cnf.512M
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# Basic Settings
-#
-
-#
-# IMPORTANT
-# If you make changes to these settings and your system uses apparmor, you may
-# also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-user = mysql
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-####tmpdir = /tmp
-tmpdir = /var/tmp
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address = 127.0.0.1
-#
-# Fine Tuning
-#
-####key_buffer = 16M
-key_buffer_size = 50M
-####max_allowed_packet = 16M
-max_allowed_packet = 1M
-thread_stack = 192K
-####thread_cache_size = 8
-thread_cache_size = 4
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover = BACKUP
-#max_connections = 100
-#table_cache = 64
-#thread_concurrency = 10
-#
-# Query Cache Configuration
-#
-
-# Q cache
-query_cache_type = 1
-#query_cache_min_res_unit = 1024
-query_cache_limit = 1M
-####query_cache_size = 16M
-query_cache_size = 8M
-#
-# Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file = /var/log/mysql/mysql.log
-#general_log = 1
-
-log_error = /var/log/mysql/mysqld.log
-
-# Innodb params
-innodb_data_file_path = ibdata1:10M:autoextend
-innodb_buffer_pool_size = 150M
-innodb_file_per_table = 1
-innodb_log_files_in_group = 2
-innodb_log_file_size=50M
-innodb_log_buffer_size=25M
-
-# Timeouts
-connect_timeout = 15
-wait_timeout = 120
-
-
-# Buffers
-join_buffer_size = 1M
-read_buffer_size = 512K
-read_rnd_buffer_size = 512K
-sort_buffer_size = 1M
-
-
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-# other settings you may need to change.
-#server-id = 1
-#log_bin = /var/lib/mysql/mysql-bin.log
-#expire_logs_days = 10
-#max_binlog_size = 100M
-
-
-# Temp table
-tmp_table_size = 16M
-max_heap_table_size = 16M
-
-# Table cache
-table_open_cache = 256
-table_definition_cache = 256
-open_files_limit = 512
-
-# Connections limit
-max_user_connections = 100
-max_connections = 110
-
-# Default Storage Engine
-default_storage_engine = innodb
-
-
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-# Disable LOAD DATA LOCAL INFILE
-local-infile = 0
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-# faster start of mysql but no tab completition
-#no-auto-rehash
-
-[isamchk]
-key_buffer = 16M
-
-#
-# IMPORTANT: Additional settings that can override those from this file!
-# The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
diff --git a/contrib/dbaas-mycnf/test/etc/my.cnf.8G b/contrib/dbaas-mycnf/test/etc/my.cnf.8G
deleted file mode 100644
index d5f120bf..00000000
--- a/contrib/dbaas-mycnf/test/etc/my.cnf.8G
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# Basic Settings
-#
-
-#
-# IMPORTANT
-# If you make changes to these settings and your system uses apparmor, you may
-# also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-user = mysql
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-####tmpdir = /tmp
-tmpdir = /var/tmp
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address = 127.0.0.1
-#
-# Fine Tuning
-#
-####key_buffer = 16M
-key_buffer_size = 800M
-####max_allowed_packet = 16M
-max_allowed_packet = 16M
-thread_stack = 192K
-####thread_cache_size = 8
-thread_cache_size = 64
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover = BACKUP
-#max_connections = 100
-#table_cache = 64
-#thread_concurrency = 10
-#
-# Query Cache Configuration
-#
-
-# Q cache
-query_cache_type = 1
-#query_cache_min_res_unit = 1024
-query_cache_limit = 1M
-####query_cache_size = 16M
-query_cache_size = 128M
-#
-# Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file = /var/log/mysql/mysql.log
-#general_log = 1
-
-log_error = /var/log/mysql/mysqld.log
-
-# Innodb params
-innodb_data_file_path = ibdata1:10M:autoextend
-innodb_buffer_pool_size = 2400M
-innodb_file_per_table = 1
-innodb_log_files_in_group = 2
-innodb_log_file_size=50M
-innodb_log_buffer_size=25M
-
-# Timeouts
-connect_timeout = 15
-wait_timeout = 120
-
-
-# Buffers
-join_buffer_size = 1M
-read_buffer_size = 512K
-read_rnd_buffer_size = 512K
-sort_buffer_size = 1M
-
-
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-# other settings you may need to change.
-#server-id = 1
-#log_bin = /var/lib/mysql/mysql-bin.log
-#expire_logs_days = 10
-#max_binlog_size = 100M
-
-
-# Temp table
-tmp_table_size = 256M
-max_heap_table_size = 256M
-
-# Table cache
-table_open_cache = 4096
-table_definition_cache = 4096
-open_files_limit = 8192
-
-# Connections limit
-max_user_connections = 1600
-max_connections = 1610
-
-# Default Storage Engine
-default_storage_engine = innodb
-
-
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-# Disable LOAD DATA LOCAL INFILE
-local-infile = 0
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-# faster start of mysql but no tab completition
-#no-auto-rehash
-
-[isamchk]
-key_buffer = 16M
-
-#
-# IMPORTANT: Additional settings that can override those from this file!
-# The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/