opendev/system-config
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-02-04 14:21:37 +00:00 committed by Gerrit Code Review
commit a5d5380cf6
2 changed files with 1 additions and 3 deletions
manifests
site.pp
modules/openstack_project/manifests
paste.pp

1
manifests/site.pp

@ -237,7 +237,6 @@ node 'lists.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'paste.openstack.org' { node 'paste.openstack.org' {
class { 'openstack_project::paste': class { 'openstack_project::paste':
db_host => hiera('paste_db_host', 'localhost'),
db_password => hiera('paste_db_password', 'XXX'), db_password => hiera('paste_db_password', 'XXX'),
mysql_root_password => hiera('paste_mysql_root_password', 'XXX'), mysql_root_password => hiera('paste_mysql_root_password', 'XXX'),
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),

3
modules/openstack_project/manifests/paste.pp

@ -1,7 +1,6 @@
# == Class: openstack_project::paste # == Class: openstack_project::paste
# #
class openstack_project::paste ( class openstack_project::paste (
$db_host,
$db_password, $db_password,
$mysql_root_password, $mysql_root_password,
$sysadmins = [] $sysadmins = []
@ -12,7 +11,7 @@ class openstack_project::paste (
} }
include lodgeit include lodgeit
lodgeit::site { 'openstack': lodgeit::site { 'openstack':
db_host => $db_host, db_host => 'localhost',
db_password => $db_password, db_password => $db_password,
port => '5000', port => '5000',
image => 'header-bg2.png', image => 'header-bg2.png',