Removed Percona 5.6,Added MariaDB 10.0

ee/cli/plugins/stack.py

@@ -90,25 +90,25 @@ class EEStackController(CementBaseController):
             EERepo.add(self, repo_url=EEVariables.ee_mysql_repo)
             Log.debug(self, 'Adding key for {0}'
                       .format(EEVariables.ee_mysql_repo))
-            EERepo.add_key(self, '1C4CBDCDCD2EFD2A',
+            EERepo.add_key(self, '0xcbcb082a1bb943db',
                            keyserver="keyserver.ubuntu.com")
             chars = ''.join(random.sample(string.ascii_letters, 8))
             Log.debug(self, "Pre-seeding MySQL")
-            Log.debug(self, "echo \"percona-server-server-5.6 "
+            Log.debug(self, "echo \"mariadb-server-10.0 "
-                      "percona-server-server/root_password "
+                      "mysql-server/root_password "
                       "password \" | "
                       "debconf-set-selections")
-            EEShellExec.cmd_exec(self, "echo \"percona-server-server-5.6 "
+            EEShellExec.cmd_exec(self, "echo \"mariadb-server-10.0 "
-                                 "percona-server-server/root_password "
+                                 "mysql-server/root_password "
                                  "password {chars}\" | "
                                  "debconf-set-selections".format(chars=chars),
                                  log=False)
-            Log.debug(self, "echo \"percona-server-server-5.6 "
+            Log.debug(self, "echo \"mariadb-server-10.0 "
-                      "percona-server-server/root_password_again "
+                      "mysql-server/root_password_again "
                       "password \" | "
                       "debconf-set-selections")
-            EEShellExec.cmd_exec(self, "echo \"percona-server-server-5.6 "
+            EEShellExec.cmd_exec(self, "echo \"mariadb-server-10.0 "
-                                 "percona-server-server/root_password_again "
+                                 "mysql-server/root_password_again "
                                  "password {chars}\" | "
                                  "debconf-set-selections".format(chars=chars),
                                  log=False)

ee/core/variables.py

@@ -78,9 +78,6 @@ class EEVariables():
     # PHP repo and packages
     if ee_platform_distro == 'Ubuntu':
         ee_php_repo = "ppa:ondrej/php5"
-    elif ee_platform_codename == 'squeeze':
-        ee_php_repo = ("deb http://packages.dotdeb.org {codename}-php54 all"
-                       .format(codename=ee_platform_codename))
     elif ee_platform_codename == 'wheezy':
         ee_php_repo = ("deb http://packages.dotdeb.org {codename}-php55 all"
                        .format(codename=ee_platform_codename))
@@ -90,9 +87,15 @@ class EEVariables():
               "graphviz"]
 
     # MySQL repo and packages
-    ee_mysql_repo = ("deb http://repo.percona.com/apt {codename} main"
+    if ee_platform_distro == 'Ubuntu':
+        ee_mysql_repo = ("deb http://mirror.aarnet.edu.au/pub/MariaDB/repo/"
+                         "10.0/ubuntu {codename} main"
+                         .format(codename=ee_platform_codename))
+    elif ee_platform_distro == 'debian':
+        ee_mysql_repo = ("deb http://mirror.aarnet.edu.au/pub/MariaDB/repo/"
+                         "10.0/debian {codename} main"
                          .format(codename=ee_platform_codename))
-    ee_mysql = ["percona-server-server-5.6", "mysqltuner", "percona-toolkit"]
+    ee_mysql = ["mariadb-server", "mysqltuner", "percona-toolkit"]
 
     # Postfix repo and packages
     ee_postfix_repo = ""