From 2ab0a5d488d185855d64264009b7d7e2b414dcab Mon Sep 17 00:00:00 2001
From: Dror Kagan <dror.kagan@hp.com>
Date: Tue, 28 May 2013 16:28:54 -0700
Subject: [PATCH] setting up the right percona pkg to be used - bug1185205

Change-Id: I80c0aaca595dfbf3a9696548c2aabc2a93d2dd88
fixes: bug#1185205
---
 reddwarf/common/cfg.py                       | 1 +
 reddwarf/guestagent/manager/mysql_service.py | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/reddwarf/common/cfg.py b/reddwarf/common/cfg.py
index 234d3215e4..9db28fab2d 100644
--- a/reddwarf/common/cfg.py
+++ b/reddwarf/common/cfg.py
@@ -50,6 +50,7 @@ common_opts = [
     cfg.BoolOpt('reddwarf_dns_support', default=False),
     cfg.StrOpt('db_api_implementation', default='reddwarf.db.sqlalchemy.api'),
     cfg.StrOpt('mysql_pkg', default='mysql-server-5.5'),
+    cfg.StrOpt('percona_pkg', default='percona-server-server-5.5'),
     cfg.StrOpt('dns_driver', default='reddwarf.dns.driver.DnsDriver'),
     cfg.StrOpt('dns_instance_entry_factory',
                default='reddwarf.dns.driver.DnsInstanceEntryFactory'),
diff --git a/reddwarf/guestagent/manager/mysql_service.py b/reddwarf/guestagent/manager/mysql_service.py
index 49aac6abca..85ac311e7d 100644
--- a/reddwarf/guestagent/manager/mysql_service.py
+++ b/reddwarf/guestagent/manager/mysql_service.py
@@ -574,7 +574,10 @@ class MySqlApp(object):
     """Prepares DBaaS on a Guest container."""
 
     TIME_OUT = 1000
-    MYSQL_PACKAGE_VERSION = CONF.mysql_pkg
+    if CONF.service_type == "mysql":
+        MYSQL_PACKAGE_VERSION = CONF.mysql_pkg
+    elif CONF.service_type == "percona":
+        MYSQL_PACKAGE_VERSION = CONF.percona_pkg
 
     def __init__(self, status):
         """ By default login with root no password for initial setup. """