opendev
/
system-config
Code Issues Proposed changes

Switch wiki.o.o to a remote database 

For improved manageability, use a remote (Trove) database for the
Mediawiki instance on wiki.openstack.org. Note: this is a catch-up
patch for implementation already in place in production.

Change-Id: Id1affae0e319216f96c3fc7e9442e3ce8c051960
Depends-On: I26a03e2ce9a6bf8bcd6acbad9e8eaaa98e0f26ab
This commit is contained in:
Jeremy Stanley 2016-08-20 14:47:51 +00:00
parent 4cb40c2c01
commit b26db7249d
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site.pp
View File

@ -372,11 +372,13 @@ node 'etherpad-dev.openstack.org' {
# Node-OS: trusty
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'),
wg_dbserver => hiera('wiki_wg_dbserver'),
wg_dbname => 'openstack_wiki',
wg_dbuser => 'wikiuser',
wg_dbpassword => hiera('wiki_wg_dbpassword'),
wg_secretkey => hiera('wiki_wg_secretkey'),
wg_upgradekey => hiera('wiki_wg_upgradekey'),

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

@ -1,11 +1,13 @@
# == Class: openstack_project::wiki
#
class openstack_project::wiki (
$mysql_root_password = '',
$sysadmins = [],
$ssl_cert_file_contents = '',
$ssl_key_file_contents = '',
$ssl_chain_file_contents = '',
$wg_dbserver = undef,
$wg_dbname = undef,
$wg_dbuser = undef,
$wg_dbpassword = undef,
$wg_secretkey = undef,
$wg_upgradekey = undef,
@ -40,6 +42,9 @@ class openstack_project::wiki (
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_dbserver => $wg_dbserver,
wg_dbname => $wg_dbname,
wg_dbuser => $wg_dbuser,
wg_dbpassword => $wg_dbpassword,
wg_secretkey => $wg_secretkey,
wg_upgradekey => $wg_upgradekey,
@ -53,20 +58,14 @@ class openstack_project::wiki (
tcp_port => 11000,
udp_port => 11000,
}
class { 'mysql::server':
root_password => $mysql_root_password,
override_options => {
'mysqld' => {
'default-storage-engine' => 'InnoDB',
}
},
}
include mysql::server::account_security
mysql_backup::backup { 'wiki':
require => Class['mysql::server'],
mysql_backup::backup_remote { 'wiki':
database_host => $wg_dbserver,
database_user => $wg_dbuser,
database_password => $wg_dbpassword,
}
include bup
bup::site { 'rs-ord':
backup_user => 'bup-wiki',