opendev/system-config
Code Issues Proposed changes

Merge "wg_captchaquestions should be a hash for mediawiki"

Browse Source
This commit is contained in:
Jenkins 2016-02-26 01:21:34 +00:00 committed by Gerrit Code Review
commit c47d6191b1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -395,7 +395,7 @@ node 'wiki.openstack.org' {
wg_dbpassword => hiera('wiki_wg_dbpassword'),
wg_secretkey => hiera('wiki_wg_secretkey'),
wg_upgradekey => hiera('wiki_wg_upgradekey'),
wg_captchaquestions_answer => hiera('wiki_wg_captchaquestions_answer'),
wg_captchaquestions => hiera('wiki_wg_captchaquestions'),
wg_googleanalyticsaccount => hiera('wiki_wg_googleanalyticsaccount'),
}
}

4
modules/openstack_project/manifests/wiki.pp
View File

@ -9,7 +9,7 @@ class openstack_project::wiki (
$wg_dbpassword = undef,
$wg_secretkey = undef,
$wg_upgradekey = undef,
$wg_captchaquestions_answer = undef,
$wg_captchaquestions = {},
$wg_googleanalyticsaccount = undef,
) {
@ -41,7 +41,7 @@ class openstack_project::wiki (
wg_dbpassword => $wg_dbpassword,
wg_secretkey => $wg_secretkey,
wg_upgradekey => $wg_upgradekey,
wg_captchaquestions_answer => $wg_captchaquestions_answer,
wg_captchaquestions => $wg_captchaquestions,
wg_googleanalyticsaccount => $wg_googleanalyticsaccount,
}
class { 'memcached':