commit 191007479a1fe21461923b35adb2acf55530ed02
author Jenkins <jenkins@review.openstack.org> Tue Jan 20 14:24:29 2015 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 20 14:24:29 2015 +0000
tree 17e7a682419e8498ac05957072dfe9e92ec7f1e1
parent ff31fc06cbba25d63db5ae691a841cb82dfa9a9d
parent 90333437337ff38c04e363cd3dbd7aa970ef21c4

Merge "Set password irrespective of mysql server version"

lib/databases/mysql

diff --git a/lib/databases/mysql b/lib/databases/mysql
index 45484c1..7bd74dc 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -138,10 +138,10 @@
     if is_ubuntu; then
         # Seed configuration with mysql password so that apt-get install doesn't
         # prompt us for a password upon install.
-        cat <<MYSQL_PRESEED | sudo debconf-set-selections
-mysql-server-5.1 mysql-server/root_password password $DATABASE_PASSWORD
-mysql-server-5.1 mysql-server/root_password_again password $DATABASE_PASSWORD
-mysql-server-5.1 mysql-server/start_on_boot boolean true
+        sudo debconf-set-selections <<MYSQL_PRESEED
+mysql-server mysql-server/root_password password $DATABASE_PASSWORD
+mysql-server mysql-server/root_password_again password $DATABASE_PASSWORD
+mysql-server mysql-server/start_on_boot boolean true
 MYSQL_PRESEED
     fi