From e1451e25abb2958636fd66d9b889dc40f07be9b4 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 24 Feb 2016 16:29:55 -0500 Subject: [PATCH] wg_captchaquestions should be a hash for mediawiki Here we are updating our defaults to have hiera store our question / answers for mediawiki captcha. Change-Id: Iff0c326401ed9a4c3b40f8d43826603e599dc4a4 Depends-On: I102ff6991831901c578dab4107b0c23245da9d4b Signed-off-by: Paul Belanger --- manifests/site.pp | 2 +- modules/openstack_project/manifests/wiki.pp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index ac98cc8bdd..3e55cd1e3d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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'), } } diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp index 11565505aa..db3771f36d 100644 --- a/modules/openstack_project/manifests/wiki.pp +++ b/modules/openstack_project/manifests/wiki.pp @@ -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, ) { @@ -40,7 +40,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':