From 8cad8d737f3a53650159ab7c00cb8e3b4649e2fb Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 8 Jan 2015 16:57:54 +0000
Subject: [PATCH] MySQL database cleanup for paste.o.o

Now that paste.openstack.org is using a local MySQL database,
unnecessary parameters are removed from the manifests. This should
only be approved after the maintenance to start using the local
database has concluded.

Change-Id: Icc63a6a08e3ee36fbc6fde207542b9e3647fb4cf
---
 manifests/site.pp                            | 1 -
 modules/openstack_project/manifests/paste.pp | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 681c946612..84249472d7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -247,7 +247,6 @@ node 'lists.openstack.org' {
 # Node-OS: precise
 node 'paste.openstack.org' {
   class { 'openstack_project::paste':
-    db_host             => hiera('paste_db_host', 'localhost'),
     db_password         => hiera('paste_db_password', 'XXX'),
     mysql_root_password => hiera('paste_mysql_root_password', 'XXX'),
     sysadmins           => hiera('sysadmins', []),
diff --git a/modules/openstack_project/manifests/paste.pp b/modules/openstack_project/manifests/paste.pp
index 5355d3914e..9a958ad52a 100644
--- a/modules/openstack_project/manifests/paste.pp
+++ b/modules/openstack_project/manifests/paste.pp
@@ -1,7 +1,6 @@
 # == Class: openstack_project::paste
 #
 class openstack_project::paste (
-  $db_host,
   $db_password,
   $mysql_root_password,
   $sysadmins = []
@@ -12,7 +11,7 @@ class openstack_project::paste (
   }
   include lodgeit
   lodgeit::site { 'openstack':
-    db_host     => $db_host,
+    db_host     => 'localhost',
     db_password => $db_password,
     port        => '5000',
     image       => 'header-bg2.png',