Merge "Revert "MySQL database cleanup for paste.o.o""

This commit is contained in:
Jenkins 2015-12-30 14:41:24 +00:00 committed by Gerrit Code Review
commit 366b036dfe
2 changed files with 3 additions and 1 deletions

View File

@ -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'),
}
}

View File

@ -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',