opendev/system-config
Code Issues Proposed changes

Merge "Add a wiki-dev.o.o server to test newer mediawiki"

Browse Source
This commit is contained in:
Jenkins 2016-08-30 15:59:53 +00:00 committed by Gerrit Code Review
commit 44fcd8e8f0
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/site.pp
View File

@ -374,6 +374,7 @@ node /^wiki\d+\.openstack\.org$/ {
$group = "wiki"
class { 'openstack_project::wiki':
sysadmins => hiera('sysadmins', []),
bup_user => 'bup-wiki',
serveradmin => hiera('infra_apache_serveradmin'),
site_hostname => 'wiki.openstack.org',
ssl_cert_file_contents => hiera('ssl_cert_file_contents'),
@ -391,6 +392,24 @@ node /^wiki\d+\.openstack\.org$/ {
}
}
# Node-OS: trusty
node /^wiki-dev\d+\.openstack\.org$/ {
$group = "wiki-dev"
class { 'openstack_project::wiki':
sysadmins => hiera('sysadmins', []),
serveradmin => hiera('infra_apache_serveradmin'),
site_hostname => 'wiki-dev.openstack.org',
wg_dbserver => hiera('wg_dbserver'),
wg_dbname => 'openstack_wiki',
wg_dbuser => 'wikiuser',
wg_dbpassword => hiera('wg_dbpassword'),
wg_secretkey => hiera('wg_secretkey'),
wg_upgradekey => hiera('wg_upgradekey'),
wg_recaptchasitekey => hiera('wg_recaptchasitekey'),
wg_recaptchasecretkey => hiera('wg_recaptchasecretkey'),
}
}
# Node-OS: trusty
node 'logstash.openstack.org' {
$iptables_es_rule = regsubst($elasticsearch_nodes,

1
modules/openstack_project/files/puppetmaster/groups.txt
View File

@ -11,4 +11,5 @@ wheel-mirror *wheel-mirror-*.openstack.org
afsadmin mirror-update.openstack.org:release.slave.openstack.org
signing signing*.ci.openstack.org
wiki wiki*.openstack.org
wiki-dev wiki-dev*.openstack.org
disabled ci-backup-rs-ord.openstack.org:ask-staging.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a:wiki.openstack.org

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

@ -3,10 +3,11 @@
class openstack_project::wiki (
$site_hostname,
$sysadmins = [],
$bup_user = undef,
$serveradmin = undef,
$ssl_cert_file_contents = '',
$ssl_key_file_contents = '',
$ssl_chain_file_contents = '',
$ssl_cert_file_contents = undef,
$ssl_key_file_contents = undef,
$ssl_chain_file_contents = undef,
$wg_dbserver = undef,
$wg_dbname = undef,
$wg_dbuser = undef,
@ -67,11 +68,12 @@ class openstack_project::wiki (
database_password => $wg_dbpassword,
}
include bup
bup::site { 'rs-ord':
backup_user => 'bup-wiki',
backup_server => 'ci-backup-rs-ord.openstack.org',
if $bup_user != undef {
include bup
bup::site { 'rs-ord':
backup_user => $bup_user,
backup_server => 'ci-backup-rs-ord.openstack.org',
}
}
class { '::elasticsearch':