diff --git a/manifests/site.pp b/manifests/site.pp index a9ccaa02f6..efb48481a7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -377,7 +377,8 @@ node 'wiki.openstack.org' { wg_dbpassword => hiera('wiki_wg_dbpassword'), wg_secretkey => hiera('wiki_wg_secretkey'), wg_upgradekey => hiera('wiki_wg_upgradekey'), - wg_captchaquestions => hiera('wiki_wg_captchaquestions'), + wg_recaptchapublickey => hiera('wiki_wg_recaptchapublickey'), + wg_recaptchaprivatekey => hiera('wiki_wg_recaptchaprivatekey'), wg_googleanalyticsaccount => hiera('wiki_wg_googleanalyticsaccount'), } } diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp index 72a0d3656b..3976c17612 100644 --- a/modules/openstack_project/manifests/wiki.pp +++ b/modules/openstack_project/manifests/wiki.pp @@ -9,7 +9,8 @@ class openstack_project::wiki ( $wg_dbpassword = undef, $wg_secretkey = undef, $wg_upgradekey = undef, - $wg_captchaquestions = {}, + $wg_recaptchapublickey = undef, + $wg_recaptchaprivatekey = undef, $wg_googleanalyticsaccount = undef, ) { @@ -42,7 +43,8 @@ class openstack_project::wiki ( wg_dbpassword => $wg_dbpassword, wg_secretkey => $wg_secretkey, wg_upgradekey => $wg_upgradekey, - wg_captchaquestions => $wg_captchaquestions, + wg_recaptchapublickey => $wg_recaptchapublickey, + wg_recaptchaprivatekey => $wg_recaptchaprivatekey, wg_googleanalyticsaccount => $wg_googleanalyticsaccount, } class { 'memcached':