From 8cf5b6abd530ed6325f8fbb94f78501f95c09015 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 29 Dec 2015 20:34:43 +0000
Subject: [PATCH] Revert "MySQL database cleanup for paste.o.o"

Now that we've determined how to adjust Trove configuration
parameters to override extremely short default connection timeouts
imposed by our provider, switch back to using a remote database for
the loggeit installation on paste.openstack.org.

This reverts commit 8cad8d737f3a53650159ab7c00cb8e3b4649e2fb.

Change-Id: I7f172b2b4f09703f1360aff0b1fef902fc935067
---
 manifests/site.pp                            | 1 +
 modules/openstack_project/manifests/paste.pp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 303af58d6c..396e26e308 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -341,6 +341,7 @@ node 'paste.openstack.org' {
   }
   class { 'openstack_project::paste':
     db_password         => hiera('paste_db_password'),
+    db_host             => hiera('paste_db_host'),
     mysql_root_password => hiera('paste_mysql_root_password'),
   }
 }
diff --git a/modules/openstack_project/manifests/paste.pp b/modules/openstack_project/manifests/paste.pp
index a74871e57f..68bfd592d3 100644
--- a/modules/openstack_project/manifests/paste.pp
+++ b/modules/openstack_project/manifests/paste.pp
@@ -2,6 +2,7 @@
 #
 class openstack_project::paste (
   $db_password,
+  $db_host,
   $mysql_root_password,
   $vhost_name         = $::fqdn,
 ) {
@@ -9,7 +10,7 @@ class openstack_project::paste (
   lodgeit::site { 'openstack':
     port        => '5000',
     db_password => $db_password,
-    db_host     => 'localhost',
+    db_host     => $db_host,
     db_user     => 'openstack',
     vhost_name  => $vhost_name,
     image       => 'header-bg2.png',