From 23896c8094a712500e33ca3f7cfa4b6823a33252 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 28 Aug 2013 12:07:15 -0700
Subject: [PATCH] Backup review and wiki MySQL DBs.

* modules/openstack_project/manifests/review_dev.pp: Remove
mysql_backup, gerrit.pp will do this for review_dev now.

* modules/openstack_project/manifests/gerrit.pp: Put MySQL backups in
central Gerrit manifest. This will backup MySQL locally for review and
review-dev.

* modules/openstack_project/manifests/wiki.pp: Backup wiki MySQL DB
locally wth the mysql_backup module.

These changes make it possible to do offsite DB backups with bup by
first backing up the databases locally.

Change-Id: I932b439c153e461fa9c6b454e132137949bd08df
---
 modules/openstack_project/manifests/gerrit.pp     | 5 +++++
 modules/openstack_project/manifests/review_dev.pp | 4 ----
 modules/openstack_project/manifests/wiki.pp       | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 3ffe12a2b2..a7e3e8b600 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -158,6 +158,11 @@ class openstack_project::gerrit (
     testmode                        => $testmode,
     require                         => Class[openstack_project::server],
   }
+
+  mysql_backup::backup { 'gerrit':
+    require => Class['::gerrit'],
+  }
+
   if ($testmode == false) {
     class { 'gerrit::cron':
       script_user     => $script_user,
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 23395836b6..9e66aa1e47 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -79,10 +79,6 @@ class openstack_project::review_dev (
     ],
   }
 
-  mysql_backup::backup { 'review-dev':
-    require => Class['openstack_project::gerrit'],
-  }
-
   file { '/var/log/gerrit_user_sync':
     ensure  => directory,
     owner   => 'root',
diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp
index 20ec06840e..10a95870b8 100644
--- a/modules/openstack_project/manifests/wiki.pp
+++ b/modules/openstack_project/manifests/wiki.pp
@@ -47,6 +47,10 @@ class openstack_project::wiki (
   }
   include mysql::server::account_security
 
+  mysql_backup::backup { 'wiki':
+    require => Class['mysql::server'],
+  }
+
   include bup
   bup::site { 'rs-ord':
     backup_user   => 'bup-wiki',