From 6b69367cab88c2fd6b33433a6897135ea56c9ce4 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 23 Feb 2016 13:08:07 -0500 Subject: [PATCH] Puppetize wiki.o.o settings This should be a noop change, we are just moving the settings into puppet. Change-Id: Ic533a5fb125125e9791c40312318be79cbbe4826 Depends-On: I1ad6da353c25aed8976806f00cc39d6c3c93e7ae Signed-off-by: Paul Belanger --- manifests/site.pp | 15 ++++++---- modules/openstack_project/manifests/wiki.pp | 32 ++++++++++++++------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index be004a1e14..109650b736 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -386,11 +386,16 @@ node 'etherpad-dev.openstack.org' { # Node-OS: precise node 'wiki.openstack.org' { class { 'openstack_project::wiki': - mysql_root_password => hiera('wiki_db_password'), - sysadmins => hiera('sysadmins', []), - ssl_cert_file_contents => hiera('wiki_ssl_cert_file_contents'), - ssl_key_file_contents => hiera('wiki_ssl_key_file_contents'), - ssl_chain_file_contents => hiera('wiki_ssl_chain_file_contents'), + mysql_root_password => hiera('wiki_db_password'), + sysadmins => hiera('sysadmins', []), + ssl_cert_file_contents => hiera('wiki_ssl_cert_file_contents'), + ssl_key_file_contents => hiera('wiki_ssl_key_file_contents'), + ssl_chain_file_contents => hiera('wiki_ssl_chain_file_contents'), + 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_googleanalyticsaccount => hiera('wiki_wg_googleanalyticsaccount'), } } diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp index f297271625..11565505aa 100644 --- a/modules/openstack_project/manifests/wiki.pp +++ b/modules/openstack_project/manifests/wiki.pp @@ -5,7 +5,12 @@ class openstack_project::wiki ( $sysadmins = [], $ssl_cert_file_contents = '', $ssl_key_file_contents = '', - $ssl_chain_file_contents = '' + $ssl_chain_file_contents = '', + $wg_dbpassword = undef, + $wg_secretkey = undef, + $wg_upgradekey = undef, + $wg_captchaquestions_answer = undef, + $wg_googleanalyticsaccount = undef, ) { package { ['openssl', 'ssl-cert', 'subversion']: @@ -22,16 +27,21 @@ class openstack_project::wiki ( ) class { 'mediawiki': - role => 'all', - mediawiki_location => '/srv/mediawiki/w', - mediawiki_images_location => '/srv/mediawiki/images', - site_hostname => $::fqdn, - ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem", - ssl_key_file => "/etc/ssl/private/${::fqdn}.key", - ssl_chain_file => '/etc/ssl/certs/intermediate.pem', - ssl_cert_file_contents => $ssl_cert_file_contents, - ssl_key_file_contents => $ssl_key_file_contents, - ssl_chain_file_contents => $ssl_chain_file_contents, + role => 'all', + mediawiki_location => '/srv/mediawiki/w', + mediawiki_images_location => '/srv/mediawiki/images', + site_hostname => $::fqdn, + ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem", + ssl_key_file => "/etc/ssl/private/${::fqdn}.key", + ssl_chain_file => '/etc/ssl/certs/intermediate.pem', + ssl_cert_file_contents => $ssl_cert_file_contents, + ssl_key_file_contents => $ssl_key_file_contents, + ssl_chain_file_contents => $ssl_chain_file_contents, + wg_dbpassword => $wg_dbpassword, + wg_secretkey => $wg_secretkey, + wg_upgradekey => $wg_upgradekey, + wg_captchaquestions_answer => $wg_captchaquestions_answer, + wg_googleanalyticsaccount => $wg_googleanalyticsaccount, } class { 'memcached': max_memory => 2048,